秒杀订单

ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/marketing/ApiGroupBuyTeamController.java

@@ -51,7 +51,7 @@ public class ApiGroupBuyTeamController extends AbstractApiController {
     @ApiOperation("查询我的团订单详情")
     @GetMapping("/my")
     @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
-    public TableDataInfo<GroupBuyTeamMemberVo> myJoinTeam(@RequestParam TeamOrderPageBo bo, PageQuery pageQuery) {
+    public TableDataInfo<GroupBuyTeamMemberVo> myJoinTeam(TeamOrderPageBo bo, PageQuery pageQuery) {
         bo.setUserId(getUserId(true));
         return groupBuyTeamMemberService.queryMyJoinTeamOrderPage(bo,pageQuery);
     }

ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/groupbuy/domain/GroupBuyTeam.java

@@ -3,8 +3,9 @@ package com.ruoyi.shop.marketing.groupbuy.domain;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
-import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.ruoyi.common.core.domain.BaseTimeEntity;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
@@ -13,7 +14,7 @@ import com.ruoyi.shop.marketing.groupbuy.domain.vo.TeamMemberUserInfoVO;
 import com.ruoyi.shop.marketing.groupbuy.service.IGroupBuyActivityGoodsService;
 import com.ruoyi.shop.marketing.groupbuy.service.IGroupBuyActivityService;
 import com.ruoyi.shop.marketing.groupbuy.service.IGroupBuyTeamMemberService;
-import com.ruoyi.user.domain.User;
+import com.ruoyi.user.domain.vo.UserVo;
 import com.ruoyi.user.service.IUserService;
 import lombok.Data;
 
@@ -195,12 +196,12 @@ public class GroupBuyTeam extends BaseTimeEntity {
 
     @TableField(exist = false)
     @FilePathValue
-    private User leaderUserInfo;
+    private UserVo leaderUserInfo;
 
-    public User loadLeaderUserInfo() {
+    public UserVo loadLeaderUserInfo() {
         if (leaderUserInfo == null) {
             IUserService service =SpringUtil.getBean("userServiceImpl", IUserService.class);
-            leaderUserInfo = service.getById(this.leaderUserId, false);
+            leaderUserInfo = service.getUserById(this.leaderUserId, false);
         }
         return leaderUserInfo;
     }