Merge branch 'master' of http://115.29.66.169:10080/new-base-shop/api

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

@@ -25,12 +25,14 @@ public class GroupBuyOrderVO implements Serializable {
 
 
     @ApiModelProperty("成员")
-    private GroupBuyTeamMember member;
+    @FilePathValue
+    private GroupBuyTeamMemberVo member;
 
     @ApiModelProperty("团")
     private GroupBuyTeam team;
 
     @ApiModelProperty("订单")
+    @FilePathValue
     private ShopOrderVo order;
 
     @ApiModelProperty("团成员信息")

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

@@ -1,13 +1,9 @@
 package com.ruoyi.shop.marketing.groupbuy.domain.vo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelBooleanConvert;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.convert.ExcelEnumConvert;
 import com.ruoyi.common.core.domain.BaseVo;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
@@ -18,7 +14,10 @@ import com.ruoyi.shop.order.enums.RightsStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -188,6 +187,7 @@ public class GroupBuyTeamMemberVo extends BaseVo {
     /**
      * 商品图片
      */
+    @FilePathValue
     @ExcelProperty(value = "商品图片")
     @ApiModelProperty("商品图片")
     private String productImg;
@@ -297,5 +297,7 @@ public class GroupBuyTeamMemberVo extends BaseVo {
     @ApiModelProperty(value = "0建团中（团长还没有支付），1建团成功，成团中（团长支付完成），2组团完成，3建团失败（团长未支付）4组团失败（时间到了人员不足）")
     private TeamStatus status;
 
-
+    @ApiModelProperty("团成员信息")
+    @FilePathValue
+    private List<TeamMemberUserInfoVO> memberInfos;
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/marketing/groupbuy/service/impl/GroupBuyTeamMemberServiceImpl.java

@@ -349,7 +349,7 @@ public class GroupBuyTeamMemberServiceImpl implements IGroupBuyTeamMemberService
     @Override
     public GroupBuyOrderVO getByMemberOrder(Long userId, Long memberId) {
         GroupBuyOrderVO groupBuyOrderVO = new GroupBuyOrderVO();
-        GroupBuyTeamMember member = this.baseMapper.selectOne(new LambdaQueryWrapper<GroupBuyTeamMember>()
+        GroupBuyTeamMemberVo member = this.baseMapper.selectVoOne(new LambdaQueryWrapper<GroupBuyTeamMember>()
             .eq(GroupBuyTeamMember::getUserId, userId)
             .eq(GroupBuyTeamMember::getId, memberId)
             .last("limit 1"));
@@ -377,6 +377,10 @@ public class GroupBuyTeamMemberServiceImpl implements IGroupBuyTeamMemberService
     @Override
     public TableDataInfo<GroupBuyTeamMemberVo> queryMyJoinTeamOrderPage(TeamOrderPageBo bo, PageQuery pageQuery) {
         Page<GroupBuyTeamMemberVo> result = baseMapper.queryMyJoinTeamOrderPage(pageQuery.build(), bo);
+        result.getRecords().forEach(o ->{
+            List<TeamMemberUserInfoVO> teamMembers = loadTeamMemberUserInfo(o.getBuyTeamId());
+            o.setMemberInfos(teamMembers);
+        });
         return TableDataInfo.build(result);
     }