修改营销数据代码， 添加昵称字段

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/duser/vo/DuserPageReqVO.java

@@ -45,4 +45,7 @@ public class DuserPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+
+    @Schema(description = "用户名称", example = "张三")
+    private String nickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/duser/vo/DuserRespVO.java

@@ -55,4 +55,8 @@ public class DuserRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "用户名称", example = "张三")
+    @ExcelProperty("用户名称")
+    private String nickName;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/duser/vo/DuserSaveReqVO.java

@@ -48,4 +48,7 @@ public class DuserSaveReqVO {
     @NotNull(message = "用户类型不能为空")
     private Long categoryId;
 
+    @Schema(description = "用户名称", example = "张三")
+    private String nickName;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/integral/vo/IntegralPageReqVO.java

@@ -34,4 +34,11 @@ public class IntegralPageReqVO extends PageParam {
     @Schema(description = "最高可获取积分")
     private Integer highQuota;
 
+    @Schema(description = "用户名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    private String nickName;
+
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/integral/vo/IntegralRespVO.java

@@ -40,4 +40,11 @@ public class IntegralRespVO {
     @Schema(description = "最高可获取积分")
     @ExcelProperty("最高可获取积分")
     private Integer highQuota;
+    @Schema(description = "用户名称", example = "赵六")
+    @ExcelProperty("用户名称")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    @ExcelProperty("用户昵称")
+    private String nickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/integral/vo/IntegralSaveReqVO.java

@@ -32,4 +32,10 @@ public class IntegralSaveReqVO {
     private Integer highQuota;
 
 
+    @Schema(description = "用户名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    private String nickName;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ordercalc/vo/OrderCalcPageReqVO.java

@@ -50,4 +50,16 @@ public class OrderCalcPageReqVO extends PageParam {
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
 
+
+    @Schema(description = "用户昵称", example = "王五")
+    private String nickName;
+
+    @Schema(description = "下单人姓名", example = "赵六")
+    private String name;
+
+    @Schema(description = "订单ID", example = "21497")
+    private Long orderId;
+    @Schema(description = "购买数量", example = "10152")
+    private Integer productCount;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ordercalc/vo/OrderCalcRespVO.java

@@ -58,5 +58,18 @@ public class OrderCalcRespVO {
     private LocalDateTime createTime;
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
+    @Schema(description = "购买数量", example = "10152")
+    @ExcelProperty("购买数量")
+    private Integer productCount;
+    @Schema(description = "用户昵称", example = "王五")
+    @ExcelProperty("用户昵称")
+    private String nickName;
+    @Schema(description = "订单ID", example = "21497")
+    @ExcelProperty("订单ID")
+    private Long orderId;
+
+    @Schema(description = "下单人姓名", example = "赵六")
+    @ExcelProperty("下单人姓名")
+    private String name;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ordercalc/vo/OrderCalcSaveReqVO.java

@@ -45,4 +45,13 @@ public class OrderCalcSaveReqVO {
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
 
+    @Schema(description = "用户昵称", example = "王五")
+    private String nickName;
+    @Schema(description = "订单ID", example = "21497")
+    private Long orderId;
+    @Schema(description = "购买数量", example = "10152")
+    private Integer productCount;
+    @Schema(description = "下单人姓名", example = "赵六")
+    private String name;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/vo/PartitionBrothersPageReqVO.java

@@ -36,5 +36,10 @@ public class PartitionBrothersPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+    @Schema(description = "用户名称", example = "张三")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    private String nickName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/vo/PartitionBrothersRespVO.java

@@ -44,5 +44,12 @@ public class PartitionBrothersRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
+    @Schema(description = "用户名称", example = "张三")
+    @ExcelProperty("用户名称")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    @ExcelProperty("用户昵称")
+    private String nickName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/vo/PartitionBrothersSaveReqVO.java

@@ -30,5 +30,10 @@ public class PartitionBrothersSaveReqVO {
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;
+    @Schema(description = "用户名称", example = "张三")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "赵六")
+    private String nickName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitioncrash/vo/PartitionCrashPageReqVO.java

@@ -35,4 +35,7 @@ public class PartitionCrashPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "用户昵称", example = "赵六")
+    private String nickName;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitioncrash/vo/PartitionCrashRespVO.java

@@ -43,4 +43,7 @@ public class PartitionCrashRespVO {
     @Schema(description = "用户名称", example = "王五")
     @ExcelProperty("用户名称")
     private String userName;
+    @Schema(description = "用户昵称", example = "赵六")
+    @ExcelProperty("用户昵称")
+    private String nickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitioncrash/vo/PartitionCrashSaveReqVO.java

@@ -28,4 +28,6 @@ public class PartitionCrashSaveReqVO {
     @Schema(description = "碰撞后额度")
     private Integer afterHitQuota;
 
+    @Schema(description = "用户昵称", example = "赵六")
+    private String nickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionson/vo/PartitionSonPageReqVO.java

@@ -36,5 +36,11 @@ public class PartitionSonPageReqVO extends PageParam {
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
+    @Schema(description = "用户名称", example = "非繁人")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "李四")
+    private String nickName;
+
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionson/vo/PartitionSonRespVO.java

@@ -44,5 +44,12 @@ public class PartitionSonRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
+    @Schema(description = "用户名称", example = "非繁人")
+    @ExcelProperty("用户名称")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "李四")
+    @ExcelProperty("用户昵称")
+    private String nickName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionson/vo/PartitionSonSaveReqVO.java

@@ -30,5 +30,11 @@ public class PartitionSonSaveReqVO {
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;
+    @Schema(description = "用户名称", example = "非繁人")
+    private String name;
+
+    @Schema(description = "用户昵称", example = "李四")
+    private String nickName;
+
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/vo/SharePathPageReqVO.java

@@ -44,5 +44,9 @@ public class SharePathPageReqVO extends PageParam {
     @Schema(description = "推荐人手机号")
     private String descPhone;
 
+    @Schema(description = "直推人昵称", example = "张三")
+    private String descNickName;
+    @Schema(description = "推荐人昵称", example = "非繁人")
+    private String ancNickName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/vo/SharePathRespVO.java

@@ -39,15 +39,26 @@ public class SharePathRespVO {
 
 
     @Schema(description = "推荐人姓名", example = "王五")
+    @ExcelProperty("推荐人姓名")
     private String ancName;
 
     @Schema(description = "推荐人手机号")
+    @ExcelProperty("推荐人手机号")
     private String ancPhone;
 
     @Schema(description = "直推人姓名", example = "李四")
+    @ExcelProperty("直推人姓名")
     private String descName;
 
     @Schema(description = "推荐人手机号")
+    @ExcelProperty("推荐人手机号")
     private String descPhone;
 
+    @Schema(description = "推荐人昵称", example = "非繁人")
+    @ExcelProperty("推荐人昵称")
+    private String ancNickName;
+
+    @Schema(description = "直推人昵称", example = "张三")
+    @ExcelProperty("直推人昵称")
+    private String descNickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/sharepath/vo/SharePathSaveReqVO.java

@@ -43,5 +43,8 @@ public class SharePathSaveReqVO {
 
     @Schema(description = "推荐人手机号")
     private String descPhone;
-
+    @Schema(description = "推荐人昵称", example = "非繁人")
+    private String ancNickName;
+    @Schema(description = "直推人昵称", example = "张三")
+    private String descNickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/duser/DuserDO.java

@@ -64,4 +64,6 @@ public class DuserDO extends BaseDO {
      */
     private Long categoryId;
 
+    private String nickName;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/integral/IntegralDO.java

@@ -45,4 +45,8 @@ public class IntegralDO extends BaseDO {
     private Long categoryId;
 
     private Integer highQuota;
+
+    private String name;
+
+    private String nickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ordercalc/OrderCalcDO.java

@@ -64,5 +64,9 @@ public class OrderCalcDO extends BaseDO {
      */
     private Integer grossProfitPlatformQuota;
     private String percentTemplate;
+    private String nickName;
+    private Integer productCount;
+    private Long orderId;
 
+    private String name;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitionbrothers/PartitionBrothersDO.java

@@ -51,5 +51,8 @@ public class PartitionBrothersDO extends BaseDO {
      * 是否是大区 0为小区 1为大区
      */
     private Integer size;
+    private String name;
+
+    private String nickName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitioncrash/PartitionCrashDO.java

@@ -51,4 +51,5 @@ public class PartitionCrashDO extends BaseDO {
      * 用户名称
      */
     private String userName;
+    private String nickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitionson/PartitionSonDO.java

@@ -51,5 +51,9 @@ public class PartitionSonDO extends BaseDO {
      * 是否是大区 0为小区 1为大区
      */
     private Integer size;
+    private String name;
+
+    private String nickName;
+
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/sharepath/SharePathDO.java

@@ -59,4 +59,12 @@ public class SharePathDO extends BaseDO {
      * 推荐人手机号
      */
     private String descPhone;
+    /**
+     * 直推人昵称
+     */
+    private String descNickName;
+    /**
+     * 推荐人昵称
+     */
+    private String ancNickName;
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/duser/DuserMapper.java

@@ -17,6 +17,7 @@ import cn.newfeifan.mall.module.distri.controller.admin.duser.vo.*;
 @Mapper
 public interface DuserMapper extends BaseMapperX<DuserDO> {
 
+
     default PageResult<DuserDO> selectPage(DuserPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<DuserDO>()
                 .eqIfPresent(DuserDO::getUserId, reqVO.getUserId())
@@ -29,6 +30,7 @@ public interface DuserMapper extends BaseMapperX<DuserDO> {
                 .eqIfPresent(DuserDO::getSource, reqVO.getSource())
                 .eqIfPresent(DuserDO::getSocialUpNeed, reqVO.getSocialUpNeed())
                 .eqIfPresent(DuserDO::getCategoryId, reqVO.getCategoryId())
+                .likeIfPresent(DuserDO::getNickName, reqVO.getNickName())
                 .orderByDesc(DuserDO::getId));
     }
     int hasParent(Long userId);

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/integral/IntegralMapper.java

@@ -20,10 +20,12 @@ public interface IntegralMapper extends BaseMapperX<IntegralDO> {
     default PageResult<IntegralDO> selectPage(IntegralPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IntegralDO>()
                 .eqIfPresent(IntegralDO::getUserId, reqVO.getUserId())
-                .eqIfPresent(IntegralDO::getCurrentQuota, reqVO.getCurrentQuota())
-                .eqIfPresent(IntegralDO::getFreezeQuota, reqVO.getFreezeQuota())
                 .eqIfPresent(IntegralDO::getCategoryId, reqVO.getCategoryId())
                 .betweenIfPresent(IntegralDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(IntegralDO::getName, reqVO.getName())
+                .likeIfPresent(IntegralDO::getNickName, reqVO.getNickName())
+                .eqIfPresent(IntegralDO::getCurrentQuota, reqVO.getCurrentQuota())
+                .eqIfPresent(IntegralDO::getFreezeQuota, reqVO.getFreezeQuota())
                 .eqIfPresent(IntegralDO::getHighQuota, reqVO.getHighQuota())
                 .orderByDesc(IntegralDO::getId));
     }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/ordercalc/OrderCalcMapper.java

@@ -24,12 +24,16 @@ public interface OrderCalcMapper extends BaseMapperX<OrderCalcDO> {
                 .betweenIfPresent(OrderCalcDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(OrderCalcDO::getPrice, reqVO.getPrice())
                 .eqIfPresent(OrderCalcDO::getCost, reqVO.getCost())
+                .eqIfPresent(OrderCalcDO::getProductCount, reqVO.getProductCount())
                 .eqIfPresent(OrderCalcDO::getGrossProfit, reqVO.getGrossProfit())
                 .eqIfPresent(OrderCalcDO::getGrossProfitUserQuota, reqVO.getGrossProfitUserQuota())
                 .eqIfPresent(OrderCalcDO::getGrossProfitAncestorQuota, reqVO.getGrossProfitAncestorQuota())
                 .eqIfPresent(OrderCalcDO::getGrossProfitBonusQuota, reqVO.getGrossProfitBonusQuota())
                 .eqIfPresent(OrderCalcDO::getGrossProfitPlatformQuota, reqVO.getGrossProfitPlatformQuota())
                 .eqIfPresent(OrderCalcDO::getPercentTemplate, reqVO.getPercentTemplate())
+                .eqIfPresent(OrderCalcDO::getOrderId, reqVO.getOrderId())
+                .likeIfPresent(OrderCalcDO::getName, reqVO.getName())
+                .likeIfPresent(OrderCalcDO::getNickName, reqVO.getNickName())
                 .orderByDesc(OrderCalcDO::getId));
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/partitionbrothers/PartitionBrothersMapper.java

@@ -26,6 +26,8 @@ public interface PartitionBrothersMapper extends BaseMapperX<PartitionBrothersDO
                 .eqIfPresent(PartitionBrothersDO::getAfterHitQuota, reqVO.getAfterHitQuota())
                 .eqIfPresent(PartitionBrothersDO::getSize, reqVO.getSize())
                 .betweenIfPresent(PartitionBrothersDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(PartitionBrothersDO::getName, reqVO.getName())
+                .likeIfPresent(PartitionBrothersDO::getNickName, reqVO.getNickName())
                 .orderByDesc(PartitionBrothersDO::getId));
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/partitioncrash/PartitionCrashMapper.java

@@ -17,6 +17,7 @@ import cn.newfeifan.mall.module.distri.controller.admin.partitioncrash.vo.*;
 @Mapper
 public interface PartitionCrashMapper extends BaseMapperX<PartitionCrashDO> {
 
+
     default PageResult<PartitionCrashDO> selectPage(PartitionCrashPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<PartitionCrashDO>()
                 .eqIfPresent(PartitionCrashDO::getUserId, reqVO.getUserId())
@@ -26,6 +27,7 @@ public interface PartitionCrashMapper extends BaseMapperX<PartitionCrashDO> {
                 .eqIfPresent(PartitionCrashDO::getAfterHitQuota, reqVO.getAfterHitQuota())
                 .betweenIfPresent(PartitionCrashDO::getCreateTime, reqVO.getCreateTime())
                 .likeIfPresent(PartitionCrashDO::getUserName, reqVO.getUserName())
+                .likeIfPresent(PartitionCrashDO::getNickName, reqVO.getNickName())
                 .orderByDesc(PartitionCrashDO::getId));
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/partitionson/PartitionSonMapper.java

@@ -26,6 +26,8 @@ public interface PartitionSonMapper extends BaseMapperX<PartitionSonDO> {
                 .eqIfPresent(PartitionSonDO::getAfterHitQuota, reqVO.getAfterHitQuota())
                 .eqIfPresent(PartitionSonDO::getSize, reqVO.getSize())
                 .betweenIfPresent(PartitionSonDO::getCreateTime, reqVO.getCreateTime())
+                .likeIfPresent(PartitionSonDO::getName, reqVO.getName())
+                .likeIfPresent(PartitionSonDO::getNickName, reqVO.getNickName())
                 .orderByDesc(PartitionSonDO::getId));
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/sharepath/SharePathMapper.java

@@ -29,6 +29,8 @@ public interface SharePathMapper extends BaseMapperX<SharePathDO> {
                 .eqIfPresent(SharePathDO::getAncPhone, reqVO.getAncPhone())
                 .likeIfPresent(SharePathDO::getDescName, reqVO.getDescName())
                 .eqIfPresent(SharePathDO::getDescPhone, reqVO.getDescPhone())
+                .likeIfPresent(SharePathDO::getAncNickName, reqVO.getAncNickName())
+                .likeIfPresent(SharePathDO::getDescNickName, reqVO.getDescNickName())
                 .orderByDesc(SharePathDO::getId));
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/message/order/DistriOrderMessage.java

@@ -1,5 +1,6 @@
 package cn.newfeifan.mall.module.distri.mq.message.order;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -27,6 +28,9 @@ public class DistriOrderMessage {
      */
     private Integer productCount;
 
+    private String name;
+    private String nickName;
+
 
     /**
      * 成本价

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/duser/DuserServiceImpl.java

@@ -124,6 +124,8 @@ public class DuserServiceImpl implements DuserService {
             // 创建一个钱包
             IntegralSaveReqVO integralSaveReqVO = IntegralSaveReqVO.builder()
                     .currentQuota(0)
+                    .nickName(user.getNickname())
+                    .name(user.getName())
                     .freezeQuota(0)
                     .categoryId(3L)
                     .userId(userId).build();
@@ -136,6 +138,7 @@ public class DuserServiceImpl implements DuserService {
                     .userId(userId)
                     .mobile(user.getMobile())
                     .name(user.getName())
+                    .nickName(user.getNickname())
                     .integralId(integralDO.getId())
                     .source(userId)
                     .socialStatus(1L)

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ordercalc/OrderCalcServiceImpl.java

@@ -200,8 +200,22 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             IntegralDO integralDO = integralService.selectByUser(sharePath.getDescendant());
             IntegralDO ptIntegral = integralService.selectByUser(1L);
             // ========== 汇总计算 =================
-            addCaclDo(percentTemplate, saveList, k, grossProfitInt, ancestorQuotaInt, descendantQuotaInt, bonusQuotaInt, platformQuotaInt);
-            // ========== 修改用户钱包 =================
+            OrderCalcSaveReqVO orderCalcSaveReqVO = OrderCalcSaveReqVO.builder()
+                    .userId(k.getUserId())
+                    .orderNo(k.getNo())
+                    .orderId(k.getOrderId())
+                    .cost(k.getCostPrice())
+                    .price(k.getPrice())
+                    .productCount(k.getProductCount())
+                    .nickName(k.getNickName())
+                    .name(k.getName())
+                    .grossProfit(grossProfitInt)
+                    .grossProfitUserQuota(ancestorQuotaInt)
+                    .grossProfitAncestorQuota(descendantQuotaInt)
+                    .grossProfitBonusQuota(bonusQuotaInt)
+                    .grossProfitPlatformQuota(platformQuotaInt)
+                    .percentTemplate(percentTemplate).build();
+            saveList.add(orderCalcSaveReqVO);            // ========== 修改用户钱包 =================
             changeUserWallet(integralSaveReqVOS, integralDO, integralDOAncestor, ptIntegral, ancestorQuotaInt, descendantQuotaInt, highQuotaInt, grossProfitInt, platformQuotaInt);
             // ========== 修改平台信息 =================
             // 每个订单计算的过程

feifan-module-mall/feifan-module-trade-biz/src/main/resources/mapper/order/BrokerageUserMapper.xml

@@ -12,6 +12,10 @@
         <result column="shopId" property="shopId"/>
         <result column="merchantId" property="merchantId"/>
         <result column="orderId" property="orderId"/>
+        <result column="name" property="name"/>
+        <result column="nickName" property="nickName"/>
+
+
     </resultMap>
 
     <select id="queryAllOrder" resultMap="BaseResultMap">
@@ -23,13 +27,17 @@
                tor.id            as orderId,
                tor.user_id       as userId,
                ps.merchant_id    as merchantId,
-               ps.shop_id        as shopId
+               ps.shop_id        as shopId,
+               ps.shop_id        as shopId,
+               mu.`name`         as name,
+               mu.nickname        as nickname
         from trade_order tor
+                 LEFT JOIN member_user mu
+                           ON tor.user_id = mu.id
                  LEFT JOIN trade_order_item toi
                            on tor.id = toi.order_id
                  LEFT JOIN product_sku ps
                            on toi.sku_id = ps.id
         where tor.update_time BETWEEN #{start} AND #{end}
     </select>
-
 </mapper>