Merge remote-tracking branch 'origin/master'

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/constant/DistriConstants.java

@@ -1,6 +1,5 @@
 package cn.newfeifan.mall.module.distri.constant;
 
-import cn.newfeifan.mall.framework.common.exception.ErrorCode;
 
 public class DistriConstants {
     // ========== 分销信息商户信息 1-002-029-000 ==========
@@ -9,5 +8,7 @@ public class DistriConstants {
     public static final Integer THREE = 3;
     public static final Long PT_ID = 1L;
 
+    public static final Boolean IS_EFFECTIVE  = true;
+
 
 }

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/ErrorCodeConstants.java

@@ -25,5 +25,6 @@ public interface ErrorCodeConstants {
     ErrorCode DUSER_MOBILE_NOT_EXISTS = new ErrorCode(1_002_030_019, "该直推人电话不存在");
 
     ErrorCode PT_PROFIT_DAILY_STATISTICS_LOG_NOT_EXISTS = new ErrorCode(1_002_030_020, "查询该日的记录不存在");
+    ErrorCode SOCIAL_STATUS_CHANGE_LOG_NOT_EXISTS = new ErrorCode(1_002_030_021, "查询日志记录不存在");
 
 }

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/SocialStatusEnum.java

@@ -0,0 +1,34 @@
+package cn.newfeifan.mall.module.distri.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum SocialStatusEnum {
+
+    REGISTER_SOCIAL(1,"本人注册用户"),
+    REGISTER_ANCESTOR_SOCIAL(2,"成功推荐新用户注册"),
+    SIGN_IN_SOCIAL(3,"签到获取的基础身价值"),
+    FAVORITE_SOCIAL(4,"收藏一个商品获取的身价值"),
+    SHOPPING_SOCIAL(5,"购物自得身价值"),
+    SHOPPING_ANCESTOR_SOCIAL(6,"直推人购物，推荐人获得身价");
+
+    /**
+     * 类型
+     */
+    private final Integer status;
+    /**
+     * 类型的名字
+     */
+    private final String name;
+
+    public static SocialStatusEnum getSocialStatusEnumByCode(int status) {
+        for (SocialStatusEnum socialStatusEnum : SocialStatusEnum.values()) {
+            if (socialStatusEnum.getStatus() == status) {
+                return socialStatusEnum;
+            }
+        }
+        return null;
+    }
+}

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

@@ -1,5 +1,7 @@
 package cn.newfeifan.mall.module.distri.controller.admin.duser;
 
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserPageReqVO;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -12,6 +14,7 @@ import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
+import java.util.stream.Collectors;
 
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
@@ -22,6 +25,8 @@ import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
 
 import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
+
+import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
 import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
 
 import cn.newfeifan.mall.module.distri.controller.admin.duser.vo.*;
@@ -82,6 +87,14 @@ public class DuserController {
         return success(result);
     }
 
+    @GetMapping("/memberUserPage")
+    @Operation(summary = "获取会员用户分页 - mUser")
+    @PreAuthorize("@ss.hasPermission('member:user:query')")
+    public CommonResult<PageResult<MemberUserRespVO>> getUserPage(@Valid MemberUserPageReqVO pageVO) {
+        return success(duserService.getMemberUserPage(pageVO));
+
+    }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出推荐用户 Excel")
     @PreAuthorize("@ss.hasPermission('distri:duser:export')")

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.duser.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -30,8 +29,8 @@ public class DuserPageReqVO extends PageParam {
     @Schema(description = "团队用户当前积分", example = "11037")
     private Long integralId;
 
-    @Schema(description = "团队用户当前身价(等级)", example = "2")
-    private Integer socialStatus;
+    @Schema(description = "团队用户当前身价id", example = "22096")
+    private Long socialStatusId;
 
     @Schema(description = "团队用户当前点数")
     private Long socialStatusPoint;

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

@@ -34,9 +34,17 @@ public class DuserRespVO {
     @ExcelProperty("团队用户当前积分")
     private Long integralId;
 
-    @Schema(description = "团队用户当前身价(等级)", example = "2")
+    @Schema(description = "团队用户当前身价id", example = "22096")
+    @ExcelProperty("团队用户当前身价(id)")
+    private Long socialStatusId;
+
+    @Schema(description = "团队用户当前身价等级", example = "等级1")
+    @ExcelProperty("团队用户当前身价(等级)")
+    private String socialStatusLevel;
+
+    @Schema(description = "团队用户当前身价等级名称", example = "白银")
     @ExcelProperty("团队用户当前身价(等级)")
-    private Integer socialStatus;
+    private String socialStatusLevelName;
 
     @Schema(description = "团队用户当前点数")
     @ExcelProperty("团队用户当前点数")

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

@@ -3,7 +3,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.duser.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import java.util.*;
 import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 推荐用户新增/修改 Request VO")
@@ -35,8 +34,8 @@ public class DuserSaveReqVO {
     @NotNull(message = "团队用户当前积分不能为空")
     private Long integralId;
 
-    @Schema(description = "团队用户当前身价(等级)", example = "2")
-    private Long socialStatus;
+    @Schema(description = "团队用户当前身价id", example = "22096")
+    private Long socialStatusId;
 
     @Schema(description = "团队用户当前点数")
     private Long socialStatusPoint;

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

@@ -27,10 +27,24 @@ public class OrderPercentageDoubleSaveReqVO {
 
     @Schema(description = "分成百分比")
     private String divideIntoPerc;
+
+    @Schema(description = "购物订单：直推人身价提升", example = "1")
+    private String orderAncestorSocialStatus;
+
+    @Schema(description = "购物订单：本人身价提升", example = "2")
+    private String orderUserSocialStatus;
+
+    @Schema(description = "新用户注册：直推人身价提升", example = "2")
+    private String registerAncestorSocialStatus;
+
+    @Schema(description = "新用户注册：本人身价提升", example = "2")
+    private String registerSocialStatus;
+
     @Schema(description = "是否启用 0关闭 1启动", example = "2")
     private Integer status;
 
-
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 
 
 

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo;
 
 import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -33,9 +32,24 @@ public class OrderPercentagePageReqVO extends PageParam {
     @Schema(description = "分成百分比")
     private String divideIntoPerc;
 
+    @Schema(description = "购物订单：直推人身价提升", example = "1")
+    private String orderAncestorSocialStatus;
+
+    @Schema(description = "购物订单：本人身价提升", example = "2")
+    private String orderUserSocialStatus;
+
+    @Schema(description = "新用户注册：直推人身价提升", example = "2")
+    private String registerAncestorSocialStatus;
+
+    @Schema(description = "新用户注册：本人身价提升", example = "2")
+    private String registerSocialStatus;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
     @Schema(description = "是否启用 0关闭 1启动", example = "2")
     private Integer status;
+
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 }

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

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
@@ -41,9 +38,28 @@ public class OrderPercentageRespVO {
     @ExcelProperty("分成百分比")
     private String divideIntoPerc;
 
+    @Schema(description = "购物订单：直推人身价提升", example = "1")
+    @ExcelProperty("购物订单：直推人身价提升")
+    private String orderAncestorSocialStatus;
+
+    @Schema(description = "购物订单：本人身价提升", example = "2")
+    @ExcelProperty("购物订单：本人身价提升")
+    private String orderUserSocialStatus;
+
+    @Schema(description = "新用户注册：直推人身价提升", example = "2")
+    @ExcelProperty("新用户注册：直推人身价提升")
+    private String registerAncestorSocialStatus;
+
+    @Schema(description = "新用户注册：本人身价提升", example = "2")
+    @ExcelProperty("新用户注册：本人身价提升")
+    private String registerSocialStatus;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
     @Schema(description = "是否启用 0关闭 1启动", example = "2")
     private Integer status;
+
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 }

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

@@ -2,8 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 积分相关计算浮动百分比设置新增/修改 Request VO")
 @Data
@@ -29,11 +27,24 @@ public class OrderPercentageSaveReqVO {
 
     @Schema(description = "分成百分比")
     private String divideIntoPerc;
-    @Schema(description = "是否启用 0关闭 1启动", example = "2")
-    private Integer status;
 
+    @Schema(description = "购物订单：直推人身价提升", example = "1")
+    private String orderAncestorSocialStatus;
+
+    @Schema(description = "购物订单：本人身价提升", example = "2")
+    private String orderUserSocialStatus;
+
+    @Schema(description = "新用户注册：直推人身价提升", example = "2")
+    private String registerAncestorSocialStatus;
 
+    @Schema(description = "新用户注册：本人身价提升", example = "2")
+    private String registerSocialStatus;
+
+    @Schema(description = "是否启用 0关闭 1启动", example = "2")
+    private Integer status;
 
+    @Schema(description = "用户注册后，获得的基础最大合赢奖、直推奖积分限额")
+    private String baseMaxQuota;
 
 
 }

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

@@ -89,7 +89,7 @@ public class SharePathController {
     }
 
     @GetMapping("/getMemberUser")
-    @Operation(summary = "获得会员用户")
+    @Operation(summary = "获得会员用户详情")
     @Parameter(name = "id", description = "用户编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('member:user:query')")
     public CommonResult<MemberUserRespVO> getUser(@RequestParam("id") Long userId) {

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/socialstatus/bo/SocialStatusBO.java

@@ -0,0 +1,15 @@
+package cn.newfeifan.mall.module.distri.controller.admin.socialstatus.bo;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * 身价状态业务对象
+ * 用于封装与社交状态相关的业务数据
+ */
+@Data
+@Builder
+public class SocialStatusBO {
+    private Long id; // 主键ID
+    private Long socialUpNeed; // 身价升级需求值
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/socialstatuschangelog/SocialStatusChangeLogController.java

@@ -0,0 +1,94 @@
+package cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.pojo.CommonResult;
+import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
+import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
+
+import cn.newfeifan.mall.framework.excel.core.util.ExcelUtils;
+
+import cn.newfeifan.mall.framework.operatelog.core.annotations.OperateLog;
+import static cn.newfeifan.mall.framework.operatelog.core.enums.OperateTypeEnum.*;
+
+import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog.SocialStatusChangeLogDO;
+import cn.newfeifan.mall.module.distri.service.socialstatuschangelog.SocialStatusChangeLogService;
+
+@Tag(name = "管理后台 - 会员身价变化日志")
+@RestController
+@RequestMapping("/distri/social-status-change-log")
+@Validated
+public class SocialStatusChangeLogController {
+
+    @Resource
+    private SocialStatusChangeLogService socialStatusChangeLogService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建会员身价变化日志")
+    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:create')")
+    public CommonResult<Long> createSocialStatusChangeLog(@Valid @RequestBody SocialStatusChangeLogSaveReqVO createReqVO) {
+        return success(socialStatusChangeLogService.createSocialStatusChangeLog(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新会员身价变化日志")
+    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:update')")
+    public CommonResult<Boolean> updateSocialStatusChangeLog(@Valid @RequestBody SocialStatusChangeLogSaveReqVO updateReqVO) {
+        socialStatusChangeLogService.updateSocialStatusChangeLog(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除会员身价变化日志")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:delete')")
+    public CommonResult<Boolean> deleteSocialStatusChangeLog(@RequestParam("id") Long id) {
+        socialStatusChangeLogService.deleteSocialStatusChangeLog(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得会员身价变化日志")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:query')")
+    public CommonResult<SocialStatusChangeLogRespVO> getSocialStatusChangeLog(@RequestParam("id") Long id) {
+        SocialStatusChangeLogDO socialStatusChangeLog = socialStatusChangeLogService.getSocialStatusChangeLog(id);
+        return success(BeanUtils.toBean(socialStatusChangeLog, SocialStatusChangeLogRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得会员身价变化日志分页")
+    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:query')")
+    public CommonResult<PageResult<SocialStatusChangeLogRespVO>> getSocialStatusChangeLogPage(@Valid SocialStatusChangeLogPageReqVO pageReqVO) {
+        PageResult<SocialStatusChangeLogDO> pageResult = socialStatusChangeLogService.getSocialStatusChangeLogPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, SocialStatusChangeLogRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出会员身价变化日志 Excel")
+    @PreAuthorize("@ss.hasPermission('distri:social-status-change-log:export')")
+    @OperateLog(type = EXPORT)
+    public void exportSocialStatusChangeLogExcel(@Valid SocialStatusChangeLogPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<SocialStatusChangeLogDO> list = socialStatusChangeLogService.getSocialStatusChangeLogPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "会员身价变化日志.xls", "数据", SocialStatusChangeLogRespVO.class,
+                        BeanUtils.toBean(list, SocialStatusChangeLogRespVO.class));
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo;
+
+import lombok.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.newfeifan.mall.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 会员身价变化日志分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class SocialStatusChangeLogPageReqVO extends PageParam {
+
+    @Schema(description = "会员资产变化类别id", example = "8042")
+    private Long socialStatusChangeCategoryId;
+
+    @Schema(description = "身价点数在本类别操作的变化值")
+    private Long variationValue;
+
+    @Schema(description = "操作对应业务对象id，例如订单id", example = "24060")
+    private Long objectId;
+
+    @Schema(description = "是否已生效")
+    private Boolean effective;
+
+    @Schema(description = "描述", example = "随便")
+    private String description;
+
+    @Schema(description = "计划生效时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] planEffectiveTime;
+
+    @Schema(description = "实际生效时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] actualEffectiveTime;
+
+    @Schema(description = "操作时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "用户ID", example = "4593")
+    private Long userId;
+
+}

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

@@ -0,0 +1,53 @@
+package cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 会员身价变化日志 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class SocialStatusChangeLogRespVO {
+
+    @Schema(description = "会员身价变化日志id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27452")
+    @ExcelProperty("会员身价变化日志id")
+    private Long id;
+
+    @Schema(description = "会员资产变化类别id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8042")
+    @ExcelProperty("会员资产变化类别id")
+    private Long socialStatusChangeCategoryId;
+
+    @Schema(description = "身价点数在本类别操作的变化值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("身价点数在本类别操作的变化值")
+    private Long variationValue;
+
+    @Schema(description = "操作对应业务对象id，例如订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24060")
+    @ExcelProperty("操作对应业务对象id，例如订单id")
+    private Long objectId;
+
+    @Schema(description = "是否已生效", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("是否已生效")
+    private Boolean effective;
+
+    @Schema(description = "描述", example = "随便")
+    @ExcelProperty("描述")
+    private String description;
+
+    @Schema(description = "计划生效时间")
+    @ExcelProperty("计划生效时间")
+    private LocalDateTime planEffectiveTime;
+
+    @Schema(description = "实际生效时间")
+    @ExcelProperty("实际生效时间")
+    private LocalDateTime actualEffectiveTime;
+
+    @Schema(description = "操作时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("操作时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4593")
+    @ExcelProperty("用户ID")
+    private Long userId;
+
+}

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

@@ -0,0 +1,43 @@
+package cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import javax.validation.constraints.*;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 会员身价变化日志新增/修改 Request VO")
+@Data
+public class SocialStatusChangeLogSaveReqVO {
+
+    @Schema(description = "会员身价变化日志id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27452")
+    private Long id;
+
+    @Schema(description = "会员资产变化类别id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8042")
+    @NotNull(message = "会员资产变化类别id不能为空")
+    private Long socialStatusChangeCategoryId;
+
+    @Schema(description = "身价点数在本类别操作的变化值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "身价点数在本类别操作的变化值不能为空")
+    private Long variationValue;
+
+    @Schema(description = "操作对应业务对象id，例如订单id", requiredMode = Schema.RequiredMode.REQUIRED, example = "24060")
+    @NotNull(message = "操作对应业务对象id，例如订单id不能为空")
+    private Long objectId;
+
+    @Schema(description = "是否已生效", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Boolean effective;
+
+    @Schema(description = "描述", example = "随便")
+    private String description;
+
+    @Schema(description = "计划生效时间")
+    private LocalDateTime planEffectiveTime;
+
+    @Schema(description = "实际生效时间")
+    private LocalDateTime actualEffectiveTime;
+
+    @Schema(description = "用户ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4593")
+    @NotNull(message = "用户ID不能为空")
+    private Long userId;
+
+}

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

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.duser;
 
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
 
@@ -48,9 +45,9 @@ public class DuserDO extends BaseDO {
      */
     private Long integralId;
     /**
-     * 团队用户当前身价(等级)
+     * 团队用户当前身价id
      */
-    private Integer socialStatus;
+    private Long socialStatusId;
     /**
      * 团队用户当前点数
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/orderpercentage/OrderPercentageDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage;
 
 import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
 
@@ -52,6 +49,28 @@ public class OrderPercentageDO extends BaseDO {
      */
     private String divideIntoPerc;
 
+    /**
+     * 购物订单：直推人身价提升
+     */
+    private String orderAncestorSocialStatus;
+    /**
+     * 购物订单：本人身价提升
+     */
+    private String orderUserSocialStatus;
+    /**
+     * 新用户注册：直推人身价提升
+     */
+    private String registerAncestorSocialStatus;
+    /**
+     * 新用户注册：本人身价提升
+     */
+    private String registerSocialStatus;
+
     private Integer status;
 
+    /**
+     * 用户注册后，获得的基础最大合赢奖、直推奖积分限额
+     */
+    private String baseMaxQuota;
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/socialstatuschangelog/SocialStatusChangeLogDO.java

@@ -0,0 +1,61 @@
+package cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog;
+
+import lombok.*;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 会员身价变化日志 DO
+ *
+ * @author 非繁人
+ */
+@TableName("distri_social_status_change_log")
+@KeySequence("distri_social_status_change_log_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SocialStatusChangeLogDO extends BaseDO {
+
+    /**
+     * 会员身价变化日志id
+     */
+    @TableId
+    private Long id;
+    /**
+     * 会员资产变化类别id
+     */
+    private Long socialStatusChangeCategoryId;
+    /**
+     * 身价点数在本类别操作的变化值
+     */
+    private Long variationValue;
+    /**
+     * 操作对应业务对象id，例如订单id
+     */
+    private Long objectId;
+    /**
+     * 是否已生效
+     */
+    private Boolean effective;
+    /**
+     * 描述
+     */
+    private String description;
+    /**
+     * 计划生效时间
+     */
+    private LocalDateTime planEffectiveTime;
+    /**
+     * 实际生效时间
+     */
+    private LocalDateTime actualEffectiveTime;
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+}

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

@@ -23,7 +23,7 @@ public interface DuserMapper extends BaseMapperX<DuserDO> {
                 .likeIfPresent(DuserDO::getName, reqVO.getName())
                 .eqIfPresent(DuserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(DuserDO::getIntegralId, reqVO.getIntegralId())
-                .eqIfPresent(DuserDO::getSocialStatus, reqVO.getSocialStatus())
+                .eqIfPresent(DuserDO::getSocialStatusId, reqVO.getSocialStatusId())
                 .eqIfPresent(DuserDO::getSocialStatusPoint, reqVO.getSocialStatusPoint())
                 .betweenIfPresent(DuserDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(DuserDO::getSource, reqVO.getSource())

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/socialstatuschangelog/SocialStatusChangeLogMapper.java

@@ -0,0 +1,33 @@
+package cn.newfeifan.mall.module.distri.dal.mysql.socialstatuschangelog;
+
+
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
+import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog.SocialStatusChangeLogDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo.*;
+
+/**
+ * 会员身价变化日志 Mapper
+ *
+ * @author 非繁人
+ */
+@Mapper
+public interface SocialStatusChangeLogMapper extends BaseMapperX<SocialStatusChangeLogDO> {
+
+    default PageResult<SocialStatusChangeLogDO> selectPage(SocialStatusChangeLogPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<SocialStatusChangeLogDO>()
+                .eqIfPresent(SocialStatusChangeLogDO::getSocialStatusChangeCategoryId, reqVO.getSocialStatusChangeCategoryId())
+                .eqIfPresent(SocialStatusChangeLogDO::getVariationValue, reqVO.getVariationValue())
+                .eqIfPresent(SocialStatusChangeLogDO::getObjectId, reqVO.getObjectId())
+                .eqIfPresent(SocialStatusChangeLogDO::getEffective, reqVO.getEffective())
+                .eqIfPresent(SocialStatusChangeLogDO::getDescription, reqVO.getDescription())
+                .betweenIfPresent(SocialStatusChangeLogDO::getPlanEffectiveTime, reqVO.getPlanEffectiveTime())
+                .betweenIfPresent(SocialStatusChangeLogDO::getActualEffectiveTime, reqVO.getActualEffectiveTime())
+                .betweenIfPresent(SocialStatusChangeLogDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(SocialStatusChangeLogDO::getUserId, reqVO.getUserId())
+                .orderByDesc(SocialStatusChangeLogDO::getId));
+    }
+
+}

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

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Objects;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -16,6 +18,10 @@ public class DistriOrderMessage {
      * 总价
      */
     private Long totalPrice;
+    /**
+     * 单笔订单的购买数量
+     */
+    private Integer count;
 
     /**
      * 单价
@@ -63,4 +69,18 @@ public class DistriOrderMessage {
      */
     private Long orderId;
 
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DistriOrderMessage item = (DistriOrderMessage) o;
+        return orderId.equals(item.orderId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(orderId);
+    }
+
 }

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

@@ -16,6 +16,12 @@ public class OrderCalcMessage {
 
     List<OrderItemMessage> orderItemMessages;
 
+
+    /**
+     * 购买数量
+     */
+    private Integer productCount;
+
     /**
      * 用户名称
      */

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

@@ -23,6 +23,11 @@ public class OrderItemMessage {
      * 购买数量
      */
     private Integer productCount;
+    /**
+     * 单笔订单的购买数量
+     */
+    private Integer count;
+
     /**
      * 成本价
      */

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

@@ -6,6 +6,8 @@ import cn.newfeifan.mall.module.distri.controller.admin.duser.vo.*;
 import cn.newfeifan.mall.module.distri.controller.admin.sharepath.vo.SharePathSaveReqVO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserPageReqVO;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
 
 /**
  * 推荐用户 Service 接口
@@ -88,4 +90,8 @@ public interface DuserService {
     DuserDO getDuserByMobile(String mobile);
 
     DuserInfoVO initDuser();
+
+    void updateDuserSocial(Long userId, Long social, Integer socialStatus);
+
+    PageResult<MemberUserRespVO> getMemberUserPage(MemberUserPageReqVO pageVO);
 }

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

@@ -1,17 +1,28 @@
 package cn.newfeifan.mall.module.distri.service.duser;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.IntegralSaveReqVO;
 import cn.newfeifan.mall.module.distri.controller.admin.sharepath.vo.SharePathSaveReqVO;
+import cn.newfeifan.mall.module.distri.controller.admin.socialstatus.bo.SocialStatusBO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage.OrderPercentageDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.sharepath.SharePathDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusDO;
+import cn.newfeifan.mall.module.distri.dal.mysql.orderpercentage.OrderPercentageMapper;
 import cn.newfeifan.mall.module.distri.dal.mysql.sharepath.SharePathMapper;
+import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
 import cn.newfeifan.mall.module.distri.service.sharepath.SharePathService;
 import cn.newfeifan.mall.module.distri.service.socialstatus.SocialStatusService;
+import cn.newfeifan.mall.module.distri.service.socialstatuschangelog.SocialStatusChangeLogService;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserPageReqVO;
+import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
+import cn.newfeifan.mall.module.member.convert.user.MemberUserConvert;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,6 +39,7 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.module.distri.dal.mysql.duser.DuserMapper;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.newfeifan.mall.module.distri.constant.DistriConstants.PT_ID;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
 
 /**
@@ -54,6 +66,11 @@ public class DuserServiceImpl implements DuserService {
     @Resource
     private PtProfitLogService ptProfitLogService;
 
+    @Resource
+    private OrderPercentageMapper orderPercentageMapper;
+
+    @Resource
+    private SocialStatusChangeLogService socialStatusChangeLogService;
 
     @Override
     public Long createDuser(DuserSaveReqVO createReqVO) {
@@ -121,6 +138,50 @@ public class DuserServiceImpl implements DuserService {
         return null;
     }
 
+    @Override
+    public void updateDuserSocial(Long userId, Long social, Integer socialStatus) {
+
+        //平台不参与身价
+        if(Objects.equals(userId, PT_ID)){
+            return;
+        }
+
+        //计算本次获得的身价
+        DuserDO duser = getDuserByUser(userId);
+        duser.setSocialStatusPoint(duser.getSocialStatusPoint() + social);
+
+        SocialStatusBO socialStatusBO = socialStatusService.calculateSocial(duser.getSocialStatusPoint());
+        duser.setSocialUpNeed(socialStatusBO.getSocialUpNeed());
+        duser.setSocialStatusId(socialStatusBO.getId());
+
+        duserMapper.updateById(duser);
+
+        socialStatusChangeLogService.createSocialStatusChangeLog(userId, social,userId, SocialStatusEnum.getSocialStatusEnumByCode(socialStatus));
+    }
+
+    @Override
+    public PageResult<MemberUserRespVO> getMemberUserPage(MemberUserPageReqVO pageVO) {
+        PageResult<MemberUserDO> pageResult = memberUserService.getUserPage(pageVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return PageResult.empty();
+        }
+        PageResult<MemberUserRespVO> result = MemberUserConvert.INSTANCE.convertPage(pageResult);
+        for (MemberUserRespVO memberUserRespVO : result.getList()) {
+            //获取团队用户
+            DuserDO duser = getDuserByUser(memberUserRespVO.getId());
+            if(duser == null) continue;
+            SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
+//            if(socialStatus == null) continue;
+            memberUserRespVO.setCurrentMemberWorthLevelName(socialStatus.getName());
+            memberUserRespVO.setCurrentMemberWorthLevel(socialStatus.getLevel());
+            //获取钱包
+            IntegralDO integral = integralService.getIntegral(memberUserRespVO.getId());
+//            if(integral == null) continue;
+            memberUserRespVO.setCurrentMemberPoints(integral.getCurrentQuota());
+        }
+        return result;
+    }
+
     @Override
     public PageResult<DuserDO> getDuserPage(DuserPageReqVO pageReqVO) {
         return duserMapper.selectPage(pageReqVO);
@@ -200,6 +261,9 @@ public class DuserServiceImpl implements DuserService {
             integralDO = new IntegralDO().setId(integralId);
         }
         if (duserDO == null) {
+            OrderPercentageDO orderPercentageDO = orderPercentageMapper.selectList().get(0);
+            SocialStatusBO socialStatusBO = socialStatusService.calculateSocial(Long.valueOf(orderPercentageDO.getRegisterSocialStatus()));
+
             // 创建一个新的营销用户
             DuserSaveReqVO duserSaveReqVO = DuserSaveReqVO.builder()
                     .userId(userId)
@@ -208,10 +272,13 @@ public class DuserServiceImpl implements DuserService {
                     .nickName(user.getNickname())
                     .integralId(integralDO.getId())
                     .source(userId)
-                    .socialStatus(1L)
-                    .socialStatusPoint(0L)
+                    .socialStatusPoint(Long.valueOf(orderPercentageDO.getRegisterSocialStatus()))
+                    .socialStatusId(socialStatusBO.getId())
+                    .socialUpNeed(socialStatusBO.getSocialUpNeed())
                     .build();
             duserMapper.insert(BeanUtils.toBean(duserSaveReqVO, DuserDO.class));
+
+            socialStatusChangeLogService.createSocialStatusChangeLog(userId, Long.valueOf(orderPercentageDO.getRegisterAncestorSocialStatus()),userId, SocialStatusEnum.REGISTER_SOCIAL);
         }
     }
 
@@ -228,12 +295,17 @@ public class DuserServiceImpl implements DuserService {
                     .eq(SharePathDO::getAncestor, duserRespVO.getUserId())
             ));
 
-            SharePathDO sharePathDO = sharePathMapper.selectOne(new LambdaQueryWrapperX<SharePathDO>()
+            SharePathDO sharePathDO = sharePathMapper.selectOne(new LambdaQueryWrapper<SharePathDO>()
                     .eq(SharePathDO::getDescendant, duserRespVO.getUserId())
                     .eq(SharePathDO::getDepth, 1)
             );
             duserRespVO.setAncNickName(sharePathDO != null ? sharePathDO.getAncNickName() : "");
             duserRespVO.setAvatar(memberUserService.getUser(duserRespVO.getUserId()).getAvatar());
+
+            SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duserRespVO.getSocialStatusId());
+            if(socialStatus == null) continue;
+            duserRespVO.setSocialStatusLevel(socialStatus.getLevel());
+            duserRespVO.setSocialStatusLevelName(socialStatus.getName());
         }
     }
 }

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

@@ -36,8 +36,6 @@ import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.LongStream;
 
 import cn.newfeifan.mall.module.distri.controller.admin.ordercalc.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
@@ -191,26 +189,30 @@ public class OrderCalcServiceImpl implements OrderCalcService {
         tradeOrderDO.forEach(k -> {
 
             // 计算单个订单的总单价
-            LongStream priceStream = k.getOrderItemMessages().stream().mapToLong(OrderItemMessage::getPrice);
+            long priceStream = k.getOrderItemMessages().stream().mapToLong(OrderItemMessage::getPrice).sum();
             // 计算单个订单的总成本
-            LongStream longStream = k.getOrderItemMessages().stream().mapToLong(OrderItemMessage::getCostPrice);
-            // 计算当个订单的总数量
-            IntStream intStream = k.getOrderItemMessages().stream().mapToInt(OrderItemMessage::getProductCount);
+            long longStream = k.getOrderItemMessages().stream().mapToLong(OrderItemMessage::getCostPrice).sum();
+            BigDecimal price = new BigDecimal(priceStream);
+            BigDecimal costPrice = new BigDecimal(longStream);
 
-            BigDecimal price = new BigDecimal(String.valueOf(priceStream));
-            BigDecimal costPrice = new BigDecimal(String.valueOf(longStream));
-            BigDecimal productCount = new BigDecimal(String.valueOf(intStream));
 
             // 计算
             // 计算利润: (价格 - 成本价格) * 产品数量
-            BigDecimal profit = price.subtract(costPrice).multiply(productCount);
+            final BigDecimal[] profit = {new BigDecimal("0")};
+            k.getOrderItemMessages().forEach(j -> {
+                BigDecimal onePrice = new BigDecimal(j.getPrice());
+                BigDecimal oneCostPrice = new BigDecimal(j.getCostPrice());
+                BigDecimal productCount = new BigDecimal(j.getCount());
+                BigDecimal oneGrossProfit = onePrice.subtract(oneCostPrice).multiply(productCount);
+                profit[0] = profit[0].add(oneGrossProfit);  // 注意这里的改动
+            });
 
 
             // 计算毛利: 利润 * 0.38
-            BigDecimal grossProfit = profit.multiply(new BigDecimal(orderPercentageDO.getGrossProfitPerc())).setScale(4, RoundingMode.DOWN);
+            BigDecimal grossProfit = profit[0].multiply(new BigDecimal(orderPercentageDO.getGrossProfitPerc())).setScale(4, RoundingMode.DOWN);
 
             // 计算平台收益
-            BigDecimal grossProfitAfterBonus = profit.multiply(oneHundred.subtract(new BigDecimal(orderPercentageDO.getGrossProfitPerc()))).setScale(4, RoundingMode.DOWN);
+            BigDecimal grossProfitAfterBonus = profit[0].multiply(oneHundred.subtract(new BigDecimal(orderPercentageDO.getGrossProfitPerc()))).setScale(4, RoundingMode.DOWN);
 
             if (otherOneHundred.compareTo(new BigDecimal(BigInteger.ZERO)) > 0) {
                 grossProfitAfterBonus = grossProfitAfterBonus.add(grossProfit.multiply(otherOneHundred).setScale(4, RoundingMode.DOWN));
@@ -255,7 +257,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                     .orderId(k.getOrderId())
                     .cost(costPrice.longValue())
                     .price(price.longValue())
-                    .productCount(productCount.intValue())
+                    .productCount(k.getProductCount())
                     .nickName(k.getNickName())
                     .name(k.getName())
                     .grossProfit(grossProfitInt)

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/partitioncrash/PartitionCrashServiceImpl.java

@@ -37,7 +37,6 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
 import cn.newfeifan.mall.module.distri.controller.admin.partitioncrash.vo.*;
@@ -159,11 +158,11 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
         // 获取当前所有用户的父亲
         Map<Long, Long> sonAndParent = new HashMap<>();
         List<Long> userIds = duserDOS.stream().map(DuserDO::getUserId).collect(Collectors.toList());
-        userIds.stream().map(k -> CompletableFuture.supplyAsync(() -> {
+
+        userIds.forEach(k -> {
             Long parent = sharePathService.queryParentBySonUserId(k);
             sonAndParent.put(k, parent);
-            return parent;
-        })).collect(Collectors.toList()).stream().map(CompletableFuture::join).collect(Collectors.toList());
+        });
 
         List<PartitionSonSaveReqVO> partitionSonSaveReqVOS = new ArrayList<>();
         List<PartitionBrothersSaveReqVO> partitionBrothersSaveReqVOS = new ArrayList<>();
@@ -175,132 +174,134 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
             // 获取当前父亲的钱包
             Long parent = sonAndParent.get(k.getUserId());
             IntegralDO parentIntegralDo = integralDOMap.get(parent);
+            if (parentIntegralDo != null) {
+
+                // 创建一个分区编号
+                String todayNo = crashTodayNo(k.getUserId());
+                String yesterdayNo = crashYesterdayNo(k.getUserId());
+
+                PartitionSonSaveReqVO.PartitionSonSaveReqVOBuilder sonBuilder = PartitionSonSaveReqVO.builder();
+                PartitionBrothersSaveReqVO.PartitionBrothersSaveReqVOBuilder brotherBuilder = PartitionBrothersSaveReqVO.builder();
+                PartitionCrashSaveReqVO.PartitionCrashSaveReqVOBuilder crashSaveReqVOBuilder = PartitionCrashSaveReqVO.builder();
+                sonBuilder.partNo(todayNo);
+                sonBuilder.userId(k.getUserId());
+                sonBuilder.name(k.getName());
+                sonBuilder.nickName(k.getNickName());
+                sonBuilder.hasHit(1);
+
+                brotherBuilder.partNo(todayNo);
+                brotherBuilder.userId(k.getUserId());
+                brotherBuilder.name(k.getName());
+                brotherBuilder.nickName(k.getNickName());
+                brotherBuilder.hasHit(1);
+
+
+                crashSaveReqVOBuilder.partNo(todayNo);
+                crashSaveReqVOBuilder.nickName(k.getNickName());
+                crashSaveReqVOBuilder.userName(k.getName());
+
+                // 获取当前用户的后代分区 , 并且该分区存在有下单的用户
+                List<OrderCalcDO> sonOrderCalcDOS = sharePathService.selectSons(k.getUserId(), userId);
+                if (sonOrderCalcDOS.isEmpty()) {
+                    // 插入空数据
+                    sonBuilder = addSonEmpty(sonBuilder, k);
+                    crashSaveReqVOBuilder.sonPrice(0L);
+                }
+                // 合计儿子分支额度
+                double grossProfitBonusQuotaPerc = Double.parseDouble(orderPercentageDO.getGrossProfitBonusQuotaPerc());
+                Long sonSumPrice = (long) (sonOrderCalcDOS.stream().mapToLong(OrderCalcDO::getGrossProfit).sum() * grossProfitBonusQuotaPerc);
+                sonBuilder.price(sonSumPrice);
+
+                // 获取当前用户的兄弟分区
+                List<OrderCalcDO> brothersOrderCalcDOS = sharePathService.selectBrothers(k.getUserId(), userId);
+                if (brothersOrderCalcDOS.isEmpty()) {
+                    // 插入空数据
+                    brotherBuilder = addBrotherEmpty(brotherBuilder, k);
+                    crashSaveReqVOBuilder.brotherPrice(0L);
+                }
 
-            // 创建一个分区编号
-            String todayNo = crashTodayNo(k.getUserId());
-            String yesterdayNo = crashYesterdayNo(k.getUserId());
-
-            PartitionSonSaveReqVO.PartitionSonSaveReqVOBuilder sonBuilder = PartitionSonSaveReqVO.builder();
-            PartitionBrothersSaveReqVO.PartitionBrothersSaveReqVOBuilder brotherBuilder = PartitionBrothersSaveReqVO.builder();
-            PartitionCrashSaveReqVO.PartitionCrashSaveReqVOBuilder crashSaveReqVOBuilder = PartitionCrashSaveReqVO.builder();
-            sonBuilder.partNo(todayNo);
-            sonBuilder.userId(k.getUserId());
-            sonBuilder.name(k.getName());
-            sonBuilder.nickName(k.getNickName());
-            sonBuilder.hasHit(1);
-
-            brotherBuilder.partNo(todayNo);
-            brotherBuilder.userId(k.getUserId());
-            brotherBuilder.name(k.getName());
-            brotherBuilder.nickName(k.getNickName());
-            brotherBuilder.hasHit(1);
-
-
-            crashSaveReqVOBuilder.partNo(todayNo);
-            crashSaveReqVOBuilder.nickName(k.getNickName());
-            crashSaveReqVOBuilder.userName(k.getName());
-
-            // 获取当前用户的后代分区 , 并且该分区存在有下单的用户
-            List<OrderCalcDO> sonOrderCalcDOS = sharePathService.selectSons(k.getUserId(), userId);
-            if (sonOrderCalcDOS.isEmpty()) {
-                // 插入空数据
-                sonBuilder = addSonEmpty(sonBuilder, k);
-                crashSaveReqVOBuilder.sonPrice(0L);
-            }
-            // 合计儿子分支额度
-            double grossProfitBonusQuotaPerc = Double.parseDouble(orderPercentageDO.getGrossProfitBonusQuotaPerc());
-            Long sonSumPrice = (long) (sonOrderCalcDOS.stream().mapToLong(OrderCalcDO::getGrossProfit).sum() * grossProfitBonusQuotaPerc);
-            sonBuilder.price(sonSumPrice);
-
-            // 获取当前用户的兄弟分区
-            List<OrderCalcDO> brothersOrderCalcDOS = sharePathService.selectBrothers(k.getUserId(), userId);
-            if (brothersOrderCalcDOS.isEmpty()) {
-                // 插入空数据
-                brotherBuilder = addBrotherEmpty(brotherBuilder, k);
-                crashSaveReqVOBuilder.brotherPrice(0L);
-            }
+                // 合并兄弟分支额度
+                Long brotherSumPrice = (long) (brothersOrderCalcDOS.stream().mapToLong(OrderCalcDO::getGrossProfit).sum() * grossProfitBonusQuotaPerc);
+                brotherBuilder.price(brotherSumPrice);
 
-            // 合并兄弟分支额度
-            Long brotherSumPrice = (long) (brothersOrderCalcDOS.stream().mapToLong(OrderCalcDO::getGrossProfit).sum() * grossProfitBonusQuotaPerc);
-            brotherBuilder.price(brotherSumPrice);
 
+                // 判断，昨天是否有存余的分支
+                PartitionCrashDO yesterdayCrash = partitionCrashMapper.selectOne(new LambdaQueryWrapperX<PartitionCrashDO>().eqIfPresent(PartitionCrashDO::getPartNo, yesterdayNo));
+                // 如果不为空， 则判断增加到哪个分支中
+                if (yesterdayCrash != null) {
+                    if (yesterdayCrash.getSonPrice() >= yesterdayCrash.getBrotherPrice()) {
+                        sonSumPrice = sonSumPrice + yesterdayCrash.getSonPrice();
+                    } else {
+                        brotherSumPrice = brotherSumPrice + yesterdayCrash.getBrotherPrice();
+                    }
+                }
+
+                Long afterCrash = 0L;
+                Long smallQuota = 0L;
+                // 碰撞计算
+                if (sonSumPrice >= brotherSumPrice) {
+                    sonBuilder.size(1);
+                    brotherBuilder.size(0);
+                    afterCrash = sonSumPrice - brotherSumPrice;
+                    smallQuota = brotherSumPrice;
 
-            // 判断，昨天是否有存余的分支
-            PartitionCrashDO yesterdayCrash = partitionCrashMapper.selectOne(new LambdaQueryWrapperX<PartitionCrashDO>().eqIfPresent(PartitionCrashDO::getPartNo, yesterdayNo));
-            // 如果不为空， 则判断增加到哪个分支中
-            if (yesterdayCrash != null) {
-                if (yesterdayCrash.getSonPrice() >= yesterdayCrash.getBrotherPrice()) {
-                    sonSumPrice = sonSumPrice + yesterdayCrash.getSonPrice();
                 } else {
-                    brotherSumPrice = brotherSumPrice + yesterdayCrash.getBrotherPrice();
+                    sonBuilder.size(0);
+                    brotherBuilder.size(1);
+                    afterCrash = brotherSumPrice - sonSumPrice;
+                    smallQuota = sonSumPrice;
                 }
-            }
-
-            Long afterCrash = 0L;
-            Long smallQuota = 0L;
-            // 碰撞计算
-            if (sonSumPrice >= brotherSumPrice) {
-                sonBuilder.size(1);
-                brotherBuilder.size(0);
-                afterCrash = sonSumPrice - brotherSumPrice;
-                smallQuota = brotherSumPrice;
-
-            } else {
-                sonBuilder.size(0);
-                brotherBuilder.size(1);
-                afterCrash = brotherSumPrice - sonSumPrice;
-                smallQuota = sonSumPrice;
-            }
 
 
-            crashSaveReqVOBuilder.brotherPrice(brotherSumPrice);
-            crashSaveReqVOBuilder.sonPrice(sonSumPrice);
-            crashSaveReqVOBuilder.afterHitQuota(afterCrash);
+                crashSaveReqVOBuilder.brotherPrice(brotherSumPrice);
+                crashSaveReqVOBuilder.sonPrice(sonSumPrice);
+                crashSaveReqVOBuilder.afterHitQuota(afterCrash);
 
-            // 积分添加 添加的时候， 需要注意当前用户是否有足够的积分可以获取
-            // 碰撞后的额度的
-            Long highQuota = integralDO.getHighQuota();
-            Long parentHighQuota = parentIntegralDo.getHighQuota();
+                // 积分添加 添加的时候， 需要注意当前用户是否有足够的积分可以获取
+                // 碰撞后的额度的
+                Long highQuota = integralDO.getHighQuota();
+                Long parentHighQuota = parentIntegralDo.getHighQuota();
 
-            BigDecimal smallBigDecimal = new BigDecimal(String.valueOf(smallQuota));
-            BigDecimal multiply = smallBigDecimal.divide(new BigDecimal("2.0"), 4, RoundingMode.DOWN);
-            if (compare(highQuota, multiply)) {
-                integralDO.setCurrentQuota(integralDO.getCurrentQuota() + multiply.intValue());
-                integralDO.setHighQuota(parentIntegralDo.getHighQuota() - multiply.intValue());
-                // 碰撞后的额度添加到日志中 增加日志模块
-                integralService.updateIntegral(BeanUtils.toBean(integralDO, IntegralSaveReqVO.class));
-                ptProfitLogService.addMessage(k.getUserId(), CaclEnum.SMALL_QUOTA_CRASH, Long.parseLong(String.valueOf(multiply.intValue())), integralDO.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO));
-            }
-            if (compare(parentHighQuota, multiply)) {
-                // 减去最高额度
-                parentIntegralDo.setCurrentQuota(parentIntegralDo.getCurrentQuota() + multiply.intValue());
-                parentIntegralDo.setHighQuota(parentIntegralDo.getHighQuota() - multiply.intValue());
-                // 碰撞后的额度添加到日志中 增加日志模块
-                integralService.updateIntegral(BeanUtils.toBean(parentIntegralDo, IntegralSaveReqVO.class));
-                ptProfitLogService.addMessage(parentIntegralDo.getUserId(), CaclEnum.SMALL_QUOTA_CRASH, Long.parseLong(String.valueOf(multiply.intValue())), parentIntegralDo.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO));
-            }
+                BigDecimal smallBigDecimal = new BigDecimal(String.valueOf(smallQuota));
+                BigDecimal multiply = smallBigDecimal.divide(new BigDecimal("2.0"), 4, RoundingMode.DOWN);
+                if (compare(highQuota, multiply)) {
+                    integralDO.setCurrentQuota(integralDO.getCurrentQuota() + multiply.intValue());
+                    integralDO.setHighQuota(parentIntegralDo.getHighQuota() - multiply.intValue());
+                    // 碰撞后的额度添加到日志中 增加日志模块
+                    integralService.updateIntegral(BeanUtils.toBean(integralDO, IntegralSaveReqVO.class));
+                    ptProfitLogService.addMessage(k.getUserId(), CaclEnum.SMALL_QUOTA_CRASH, Long.parseLong(String.valueOf(multiply.intValue())), integralDO.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO));
+                }
+                if (compare(parentHighQuota, multiply)) {
+                    // 减去最高额度
+                    parentIntegralDo.setCurrentQuota(parentIntegralDo.getCurrentQuota() + multiply.intValue());
+                    parentIntegralDo.setHighQuota(parentIntegralDo.getHighQuota() - multiply.intValue());
+                    // 碰撞后的额度添加到日志中 增加日志模块
+                    integralService.updateIntegral(BeanUtils.toBean(parentIntegralDo, IntegralSaveReqVO.class));
+                    ptProfitLogService.addMessage(parentIntegralDo.getUserId(), CaclEnum.SMALL_QUOTA_CRASH, Long.parseLong(String.valueOf(multiply.intValue())), parentIntegralDo.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO));
+                }
 
-            // 获取计算后积分, Long为userId, Integer为碰撞后额度
-            HashMap<Long, Long> map = new HashMap<>();
-            // 如果为当前用户为平台,则不需要存入这个地方
-            if (!k.getUserId().equals(PT_ID)) {
-                map.put(k.getUserId(), multiply.longValue());
-            }
-            if (!parentIntegralDo.getUserId().equals(PT_ID)) {
-                map.put(parentIntegralDo.getUserId(), multiply.longValue());
-            }
-            afterCrashMap.add(map);
+                // 获取计算后积分, Long为userId, Integer为碰撞后额度
+                HashMap<Long, Long> map = new HashMap<>();
+                // 如果为当前用户为平台,则不需要存入这个地方
+                if (!k.getUserId().equals(PT_ID)) {
+                    map.put(k.getUserId(), multiply.longValue());
+                }
+                if (!parentIntegralDo.getUserId().equals(PT_ID)) {
+                    map.put(parentIntegralDo.getUserId(), multiply.longValue());
+                }
+                afterCrashMap.add(map);
 
-            log.info(k.getNickName() + "用户合赢奖已经计算: 该用户合赢奖为: \t" +
-                    "兄弟分区为: " + brotherBuilder.build() + "\t" +
-                    "后代分区为: " + sonBuilder.build() + "\t" +
-                    "碰撞分区为: " + crashSaveReqVOBuilder.build() + "\t");
+                log.info(k.getNickName() + "用户合赢奖已经计算: 该用户合赢奖为: \t" +
+                        "兄弟分区为: " + brotherBuilder.build() + "\t" +
+                        "后代分区为: " + sonBuilder.build() + "\t" +
+                        "碰撞分区为: " + crashSaveReqVOBuilder.build() + "\t");
 
-            partitionSonSaveReqVOS.add(sonBuilder.build());
-            partitionBrothersSaveReqVOS.add(brotherBuilder.build());
-            partitionCrashSaveReqVOS.add(crashSaveReqVOBuilder.build());
+                partitionSonSaveReqVOS.add(sonBuilder.build());
+                partitionBrothersSaveReqVOS.add(brotherBuilder.build());
+                partitionCrashSaveReqVOS.add(crashSaveReqVOBuilder.build());
 
 
+            }
         });
 
         partitionSonService.saveBatch(partitionSonSaveReqVOS);
@@ -320,7 +321,7 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
                 // 当前平台总积分
 //                Integer ptTotalAdd = ptProfit.getPtTotalAdd();
 
-                if(entry.getValue() == 0){
+                if (entry.getValue() == 0) {
                     continue;
                 }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/sharepath/SharePathServiceImpl.java

@@ -4,9 +4,15 @@ import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc.OrderCalcDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage.OrderPercentageDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusDO;
+import cn.newfeifan.mall.module.distri.dal.mysql.orderpercentage.OrderPercentageMapper;
+import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
 import cn.newfeifan.mall.module.distri.service.duser.DuserService;
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.ordercalc.OrderCalcService;
+import cn.newfeifan.mall.module.distri.service.socialstatus.SocialStatusService;
+import cn.newfeifan.mall.module.distri.service.socialstatuschangelog.SocialStatusChangeLogService;
 import cn.newfeifan.mall.module.member.controller.admin.user.vo.MemberUserRespVO;
 import cn.newfeifan.mall.module.member.convert.user.MemberUserConvert;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
@@ -61,6 +67,15 @@ public class SharePathServiceImpl implements SharePathService {
     @Lazy
     private IntegralService integralService;
 
+    @Resource
+    private SocialStatusChangeLogService socialStatusChangeLogService;
+
+    @Resource
+    private OrderPercentageMapper orderPercentageMapper;
+
+    @Resource
+    private SocialStatusService socialStatusService;
+
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
         // 插入
@@ -105,6 +120,11 @@ public class SharePathServiceImpl implements SharePathService {
                 descendant.getName(),
                 descendant.getNickname(),
                 descendant.getMobile());
+
+        OrderPercentageDO orderPercentageDO = orderPercentageMapper.selectList().get(0);
+        duserService.updateDuserSocial(createReqVO.getAncestor(), Long.valueOf(orderPercentageDO.getRegisterAncestorSocialStatus()), SocialStatusEnum.REGISTER_ANCESTOR_SOCIAL.getStatus());
+        socialStatusChangeLogService.createSocialStatusChangeLog(createReqVO.getAncestor(), Long.valueOf(orderPercentageDO.getRegisterAncestorSocialStatus()),createReqVO.getAncestor(), SocialStatusEnum.REGISTER_ANCESTOR_SOCIAL);
+
     }
 
     @Override
@@ -125,7 +145,7 @@ public class SharePathServiceImpl implements SharePathService {
     }
 
     private Boolean hasParent(Long descendant) {
-        SharePathDO sharePathDO = sharePathMapper.selectOne(new LambdaQueryWrapperX<SharePathDO>()
+        List<SharePathDO> sharePathDO = sharePathMapper.selectList(new LambdaQueryWrapperX<SharePathDO>()
                 .eqIfPresent(SharePathDO::getDescendant, descendant)
                 .eqIfPresent(SharePathDO::getDepth, 1));
         return sharePathDO != null;
@@ -220,10 +240,18 @@ public class SharePathServiceImpl implements SharePathService {
                 .eq(SharePathDO::getDescendant, userId)
                 .eq(SharePathDO::getDepth, 1)
         );
-        if(sharePathDO != null) memberUserRespVO.setAncNickName(sharePathDO.getAncName());
+        if (sharePathDO != null) memberUserRespVO.setAncNickName(sharePathDO.getAncNickName());
+
+        DuserDO duser = duserService.getDuserByUser(memberUserRespVO.getId());
+        //没有这个用户直接就返回
+        if (duser == null) return memberUserRespVO;
 
         IntegralDO integral = integralService.getIntegralByUserId(userId);
-        if(integral != null) memberUserRespVO.setCurrentQuota(integral.getCurrentQuota());
+        if (integral != null) memberUserRespVO.setCurrentQuota(integral.getCurrentQuota());
+
+        SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
+        memberUserRespVO.setCurrentMemberWorthLevelName(socialStatus.getName());
+        memberUserRespVO.setCurrentMemberWorthLevel(socialStatus.getLevel());
 
         return memberUserRespVO;
     }
@@ -329,14 +357,14 @@ public class SharePathServiceImpl implements SharePathService {
     public List<OrderCalcDO> selectBrothers(Long userId, List<Long> userIds) {
         List<Long> sortedSiblings = new ArrayList<>();
         // 先查询出他的父亲
-        SharePathDO sharePathDO = sharePathMapper.selectOne(new LambdaQueryWrapperX<SharePathDO>().eq(SharePathDO::getDepth, 1).eq(SharePathDO::getDescendant, userId));
-        if (sharePathDO == null) {
+        List<SharePathDO> sharePathDO = sharePathMapper.selectList(new LambdaQueryWrapperX<SharePathDO>().eq(SharePathDO::getDepth, 1).eq(SharePathDO::getDescendant, userId));
+        if (sharePathDO.isEmpty()) {
             sortedSiblings = sharePathMapper.findLessSortedSiblings(userId);
         } else {
             // 再根据父亲查询他的所有儿子
             List<SharePathDO> sharePathDOS = sharePathMapper.selectList(new LambdaQueryWrapperX<SharePathDO>()
                     .eq(SharePathDO::getDepth, 1)
-                    .eq(SharePathDO::getAncestor, sharePathDO.getAncestor()));
+                    .eq(SharePathDO::getAncestor, sharePathDO.get(0).getAncestor()));
             //最后再进行排序
             sortedSiblings = filterByDescendant(sharePathDOS, userId);
             // 查询兄弟的所有儿子
@@ -383,7 +411,14 @@ public class SharePathServiceImpl implements SharePathService {
 
         // 过滤出所有 sort 值大于找到的 sort 值的记录
         return sharePaths.stream()
-                .filter(sharePath -> sharePath.getSort() > reference.getSort())
+                .filter(sharePath ->
+                        {
+                            if (reference.getSort() != null && sharePath.getSort() != null) {
+                                return sharePath.getSort() > reference.getSort();
+                            }
+                            return false;
+                        }
+                )
                 .map(SharePathDO::getDescendant)
                 .collect(Collectors.toList());
     }
@@ -392,12 +427,12 @@ public class SharePathServiceImpl implements SharePathService {
     @Override
     public Long queryParentBySonUserId(Long userId) {
 
-        SharePathDO sharePathDO = sharePathMapper.selectOne(new LambdaQueryWrapperX<SharePathDO>()
+        List<SharePathDO> sharePathDO = sharePathMapper.selectList(new LambdaQueryWrapperX<SharePathDO>()
                 .eqIfPresent(SharePathDO::getDescendant, userId).eqIfPresent(SharePathDO::getDepth, 1));
-        if (sharePathDO == null) {
+        if (sharePathDO.isEmpty()) {
             return 1L;
         } else {
-            return sharePathDO.getAncestor();
+            return sharePathDO.get(0).getAncestor();
         }
 
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/socialstatus/SocialStatusService.java

@@ -1,11 +1,11 @@
 package cn.newfeifan.mall.module.distri.service.socialstatus;
 
-import java.util.*;
 import javax.validation.*;
+
+import cn.newfeifan.mall.module.distri.controller.admin.socialstatus.bo.SocialStatusBO;
 import cn.newfeifan.mall.module.distri.controller.admin.socialstatus.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 
 /**
  * 分销用户身价 Service 接口
@@ -53,6 +53,12 @@ public interface SocialStatusService {
     PageResult<SocialStatusDO> getSocialStatusPage(SocialStatusPageReqVO pageReqVO);
 
 
-
+    /**
+     * 获得身价对象
+     *
+     * @param point 用户当前身价
+     * @return 身价对象
+     */
+    SocialStatusBO calculateSocial(Long point);
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/socialstatus/SocialStatusServiceImpl.java

@@ -1,19 +1,18 @@
 package cn.newfeifan.mall.module.distri.service.socialstatus;
 
+import cn.newfeifan.mall.module.distri.controller.admin.socialstatus.bo.SocialStatusBO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 
 import cn.newfeifan.mall.module.distri.controller.admin.socialstatus.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatus.SocialStatusDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
-import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 
 import cn.newfeifan.mall.module.distri.dal.mysql.socialstatus.SocialStatusMapper;
@@ -75,6 +74,26 @@ public class SocialStatusServiceImpl implements SocialStatusService {
         return socialStatusMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public SocialStatusBO calculateSocial(Long point) {
+        List<SocialStatusDO> socialStatusDOS = socialStatusMapper.selectList(new LambdaQueryWrapper<SocialStatusDO>()
+                .orderByAsc(SocialStatusDO::getPoint)
+        );
+
+        SocialStatusBO socialStatusBO = SocialStatusBO.builder().build();
+        for (int i = 0; i < socialStatusDOS.size(); i++) {
+            if (point < socialStatusDOS.get(i).getPoint()) {
+                socialStatusBO.setId(socialStatusDOS.get(i - 1).getId());
+                if (i + 1 >= socialStatusDOS.size()) {
+                    socialStatusBO.setSocialUpNeed(0L);
+                } else {
+                    socialStatusBO.setSocialUpNeed(socialStatusDOS.get(i).getPoint() - point);
+                }
+                break;
+            }
+        }
+        return socialStatusBO;
+    }
 
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/socialstatuschangelog/SocialStatusChangeLogService.java

@@ -0,0 +1,66 @@
+package cn.newfeifan.mall.module.distri.service.socialstatuschangelog;
+
+import javax.validation.*;
+import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog.SocialStatusChangeLogDO;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
+
+/**
+ * 会员身价变化日志 Service 接口
+ *
+ * @author 非繁人
+ */
+public interface SocialStatusChangeLogService {
+
+    /**
+     * 创建会员身价变化日志
+     *
+     * @param userId 用户编号
+     * @param socialValue 身价值
+     * @param objectId 业务对象编号
+     * @param socialStatusEnum 业务对象枚举
+     * @return 编号
+     */
+    Long createSocialStatusChangeLog(Long userId, Long socialValue, Long objectId, SocialStatusEnum socialStatusEnum);
+
+    /**
+     * 创建会员身价变化日志
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createSocialStatusChangeLog(@Valid SocialStatusChangeLogSaveReqVO createReqVO);
+
+
+    /**
+     * 更新会员身价变化日志
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateSocialStatusChangeLog(@Valid SocialStatusChangeLogSaveReqVO updateReqVO);
+
+    /**
+     * 删除会员身价变化日志
+     *
+     * @param id 编号
+     */
+    void deleteSocialStatusChangeLog(Long id);
+
+    /**
+     * 获得会员身价变化日志
+     *
+     * @param id 编号
+     * @return 会员身价变化日志
+     */
+    SocialStatusChangeLogDO getSocialStatusChangeLog(Long id);
+
+    /**
+     * 获得会员身价变化日志分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 会员身价变化日志分页
+     */
+    PageResult<SocialStatusChangeLogDO> getSocialStatusChangeLogPage(SocialStatusChangeLogPageReqVO pageReqVO);
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/socialstatuschangelog/SocialStatusChangeLogServiceImpl.java

@@ -0,0 +1,90 @@
+package cn.newfeifan.mall.module.distri.service.socialstatuschangelog;
+
+import cn.newfeifan.mall.module.distri.enums.SocialStatusEnum;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+
+import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangelog.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangelog.SocialStatusChangeLogDO;
+import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
+
+import cn.newfeifan.mall.module.distri.dal.mysql.socialstatuschangelog.SocialStatusChangeLogMapper;
+
+import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.newfeifan.mall.module.distri.constant.DistriConstants.IS_EFFECTIVE;
+import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
+
+/**
+ * 会员身价变化日志 Service 实现类
+ *
+ * @author 非繁人
+ */
+@Service
+@Validated
+public class SocialStatusChangeLogServiceImpl implements SocialStatusChangeLogService {
+
+    @Resource
+    private SocialStatusChangeLogMapper socialStatusChangeLogMapper;
+
+    @Override
+    public Long createSocialStatusChangeLog(Long userId, Long socialValue, Long objectId, SocialStatusEnum socialStatusEnum) {
+        // 插入
+        SocialStatusChangeLogDO socialStatusChangeLog = SocialStatusChangeLogDO.builder()
+                .socialStatusChangeCategoryId(Long.valueOf(socialStatusEnum.getStatus()))
+                .description(socialStatusEnum.getName())
+                .variationValue(socialValue)
+                .objectId(objectId)
+                .effective(IS_EFFECTIVE)
+                .userId(userId).build();
+        socialStatusChangeLogMapper.insert(socialStatusChangeLog);
+        // 返回
+        return socialStatusChangeLog.getId();
+    }
+
+    @Override
+    public Long createSocialStatusChangeLog(SocialStatusChangeLogSaveReqVO createReqVO) {
+        // 插入
+        SocialStatusChangeLogDO socialStatusChangeLog = BeanUtils.toBean(createReqVO, SocialStatusChangeLogDO.class);
+        socialStatusChangeLogMapper.insert(socialStatusChangeLog);
+        // 返回
+        return socialStatusChangeLog.getId();
+    }
+
+    @Override
+    public void updateSocialStatusChangeLog(SocialStatusChangeLogSaveReqVO updateReqVO) {
+        // 校验存在
+        validateSocialStatusChangeLogExists(updateReqVO.getId());
+        // 更新
+        SocialStatusChangeLogDO updateObj = BeanUtils.toBean(updateReqVO, SocialStatusChangeLogDO.class);
+        socialStatusChangeLogMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteSocialStatusChangeLog(Long id) {
+        // 校验存在
+        validateSocialStatusChangeLogExists(id);
+        // 删除
+        socialStatusChangeLogMapper.deleteById(id);
+    }
+
+    private void validateSocialStatusChangeLogExists(Long id) {
+        if (socialStatusChangeLogMapper.selectById(id) == null) {
+            throw exception(SOCIAL_STATUS_CHANGE_LOG_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public SocialStatusChangeLogDO getSocialStatusChangeLog(Long id) {
+        return socialStatusChangeLogMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<SocialStatusChangeLogDO> getSocialStatusChangeLogPage(SocialStatusChangeLogPageReqVO pageReqVO) {
+        return socialStatusChangeLogMapper.selectPage(pageReqVO);
+    }
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/resources/mapper/socialstatuschangelog/SocialStatusChangeLogMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.newfeifan.mall.module.distri.dal.mysql.socialstatuschangelog.SocialStatusChangeLogMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.zhongxing.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>

feifan-module-distri/feifan-module-distri-biz/src/test/java/cn/newfeifan/mall/module/distri/service/ptprofitdailystatisticslog/PtProfitDailyStatisticsLogServiceImplTest.java

@@ -1,134 +0,0 @@
-package cn.newfeifan.mall.module.distri.service.ptprofitdailystatisticslog;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-
-import javax.annotation.Resource;
-
-import cn.newfeifan.mall.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.newfeifan.mall.module.distri.controller.admin.ptprofitdailystatisticslog.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitdailystatisticslog.PtProfitDailyStatisticsLogDO;
-import cn.newfeifan.mall.module.distri.dal.mysql.ptprofitdailystatisticslog.PtProfitDailyStatisticsLogMapper;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-
-import org.springframework.context.annotation.Import;
-import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
-import static cn.newfeifan.mall.framework.test.core.util.AssertUtils.*;
-import static cn.newfeifan.mall.framework.test.core.util.RandomUtils.*;
-import static cn.newfeifan.mall.framework.common.util.date.LocalDateTimeUtils.*;
-import static cn.newfeifan.mall.framework.common.util.object.ObjectUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * {@link PtProfitDailyStatisticsLogServiceImpl} 的单元测试类
- *
- * @author 非繁人
- */
-@Import(PtProfitDailyStatisticsLogServiceImpl.class)
-public class PtProfitDailyStatisticsLogServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private PtProfitDailyStatisticsLogServiceImpl ptProfitDailyStatisticsLogService;
-
-    @Resource
-    private PtProfitDailyStatisticsLogMapper ptProfitDailyStatisticsLogMapper;
-
-    @Test
-    public void testCreatePtProfitDailyStatisticsLog_success() {
-        // 准备参数
-        PtProfitDailyStatisticsLogSaveReqVO createReqVO = randomPojo(PtProfitDailyStatisticsLogSaveReqVO.class).setId(null);
-
-        // 调用
-        Long ptProfitDailyStatisticsLogId = ptProfitDailyStatisticsLogService.createPtProfitDailyStatisticsLog(createReqVO);
-        // 断言
-        assertNotNull(ptProfitDailyStatisticsLogId);
-        // 校验记录的属性是否正确
-        PtProfitDailyStatisticsLogDO ptProfitDailyStatisticsLog = ptProfitDailyStatisticsLogMapper.selectById(ptProfitDailyStatisticsLogId);
-        assertPojoEquals(createReqVO, ptProfitDailyStatisticsLog, "id");
-    }
-
-    @Test
-    public void testUpdatePtProfitDailyStatisticsLog_success() {
-        // mock 数据
-        PtProfitDailyStatisticsLogDO dbPtProfitDailyStatisticsLog = randomPojo(PtProfitDailyStatisticsLogDO.class);
-        ptProfitDailyStatisticsLogMapper.insert(dbPtProfitDailyStatisticsLog);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        PtProfitDailyStatisticsLogSaveReqVO updateReqVO = randomPojo(PtProfitDailyStatisticsLogSaveReqVO.class, o -> {
-            o.setId(dbPtProfitDailyStatisticsLog.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        ptProfitDailyStatisticsLogService.updatePtProfitDailyStatisticsLog(updateReqVO);
-        // 校验是否更新正确
-        PtProfitDailyStatisticsLogDO ptProfitDailyStatisticsLog = ptProfitDailyStatisticsLogMapper.selectById(updateReqVO.getId()); // 获取最新的
-        assertPojoEquals(updateReqVO, ptProfitDailyStatisticsLog);
-    }
-
-    @Test
-    public void testUpdatePtProfitDailyStatisticsLog_notExists() {
-        // 准备参数
-        PtProfitDailyStatisticsLogSaveReqVO updateReqVO = randomPojo(PtProfitDailyStatisticsLogSaveReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> ptProfitDailyStatisticsLogService.updatePtProfitDailyStatisticsLog(updateReqVO), PT_PROFIT_DAILY_STATISTICS_LOG_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeletePtProfitDailyStatisticsLog_success() {
-        // mock 数据
-        PtProfitDailyStatisticsLogDO dbPtProfitDailyStatisticsLog = randomPojo(PtProfitDailyStatisticsLogDO.class);
-        ptProfitDailyStatisticsLogMapper.insert(dbPtProfitDailyStatisticsLog);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbPtProfitDailyStatisticsLog.getId();
-
-        // 调用
-        ptProfitDailyStatisticsLogService.deletePtProfitDailyStatisticsLog(id);
-       // 校验数据不存在了
-       assertNull(ptProfitDailyStatisticsLogMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeletePtProfitDailyStatisticsLog_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> ptProfitDailyStatisticsLogService.deletePtProfitDailyStatisticsLog(id), PT_PROFIT_DAILY_STATISTICS_LOG_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetPtProfitDailyStatisticsLogPage() {
-       // mock 数据
-       PtProfitDailyStatisticsLogDO dbPtProfitDailyStatisticsLog = randomPojo(PtProfitDailyStatisticsLogDO.class, o -> { // 等会查询到
-           o.setEveryday(null);
-           o.setTotalCollisionAmount(null);
-           o.setTotalRemainingAmount(null);
-           o.setCreateTime(null);
-       });
-       ptProfitDailyStatisticsLogMapper.insert(dbPtProfitDailyStatisticsLog);
-       // 测试 everyday 不匹配
-       ptProfitDailyStatisticsLogMapper.insert(cloneIgnoreId(dbPtProfitDailyStatisticsLog, o -> o.setEveryday(null)));
-       // 测试 totalCollisionAmount 不匹配
-       ptProfitDailyStatisticsLogMapper.insert(cloneIgnoreId(dbPtProfitDailyStatisticsLog, o -> o.setTotalCollisionAmount(null)));
-       // 测试 totalRemainingAmount 不匹配
-       ptProfitDailyStatisticsLogMapper.insert(cloneIgnoreId(dbPtProfitDailyStatisticsLog, o -> o.setTotalRemainingAmount(null)));
-       // 测试 createTime 不匹配
-       ptProfitDailyStatisticsLogMapper.insert(cloneIgnoreId(dbPtProfitDailyStatisticsLog, o -> o.setCreateTime(null)));
-       // 准备参数
-       PtProfitDailyStatisticsLogPageReqVO reqVO = new PtProfitDailyStatisticsLogPageReqVO();
-       reqVO.setEveryday(null);
-       reqVO.setTotalCollisionAmount(null);
-       reqVO.setTotalRemainingAmount(null);
-       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-
-       // 调用
-       PageResult<PtProfitDailyStatisticsLogDO> pageResult = ptProfitDailyStatisticsLogService.getPtProfitDailyStatisticsLogPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbPtProfitDailyStatisticsLog, pageResult.getList().get(0));
-    }
-
-}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -6,6 +6,8 @@ import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.distri.mq.message.order.CalcMessage;
 import cn.newfeifan.mall.module.distri.mq.message.order.DistriOrderMessage;
+import cn.newfeifan.mall.module.distri.mq.message.order.OrderCalcMessage;
+import cn.newfeifan.mall.module.distri.mq.message.order.OrderItemMessage;
 import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
 import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
@@ -15,7 +17,6 @@ import cn.newfeifan.mall.module.pay.dal.dataobject.app.PayAppDO;
 import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.newfeifan.mall.module.pay.service.app.PayAppService;
 import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
-import cn.newfeifan.mall.module.trade.controller.admin.delivery.vo.expresstemplate.ShopBO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.*;
 import cn.newfeifan.mall.module.trade.convert.order.TradeOrderConvert;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
@@ -39,6 +40,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
@@ -200,18 +202,14 @@ public class TradeOrderController {
     @Operation(summary = "获得交易订单数量")
     public CommonResult<Map<Integer, Long>> getOrderCount(@RequestParam(value = "merId", required = false) Long merId) {
         Map<Integer, Long> orderCount = Maps.newLinkedHashMapWithExpectedSize(6);
-        ShopBO shop = new ShopBO();
-        if (merId != null) {
-            shop = tradeOrderQueryService.getShop();
-        }
 
-        orderCount.put(-1, tradeOrderQueryService.getOrderCount(null, shop.getShopId(), shop.getMerId()));
-        orderCount.put(TradeOrderStatusEnum.AFTER_SALE.getStatus(), afterSaleService.getApplyingAfterSaleCount(null, shop.getShopId(), shop.getMerId()));
-        orderCount.put(TradeOrderStatusEnum.UNPAID.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNPAID.getStatus(), shop.getShopId(), shop.getMerId()));
-        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus(), shop.getShopId(), shop.getMerId()));
-        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus(), shop.getShopId(), shop.getMerId()));
-        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus(), shop.getShopId(), shop.getMerId()));
-        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus(), shop.getShopId(), shop.getMerId()));
+        orderCount.put(-1, tradeOrderQueryService.getOrderCount(null, merId));
+        orderCount.put(TradeOrderStatusEnum.AFTER_SALE.getStatus(), afterSaleService.getApplyingAfterSaleCount(null, merId));
+        orderCount.put(TradeOrderStatusEnum.UNPAID.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNPAID.getStatus(), merId));
+        orderCount.put(TradeOrderStatusEnum.UNDELIVERED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.UNDELIVERED.getStatus(), merId));
+        orderCount.put(TradeOrderStatusEnum.DELIVERED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.DELIVERED.getStatus(), merId));
+        orderCount.put(TradeOrderStatusEnum.COMPLETED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.COMPLETED.getStatus(), merId));
+        orderCount.put(TradeOrderStatusEnum.CANCELED.getStatus(), tradeOrderQueryService.getOrderCount(TradeOrderStatusEnum.CANCELED.getStatus(), merId));
         return success(orderCount);
     }
 
@@ -254,8 +252,39 @@ public class TradeOrderController {
     public CommonResult<String> startCalc(@RequestParam("orderIds") List<Long> orderIds) {
 //        List<DistriOrderMessage> appTradeOrderDetailRespVos = tradeOrderQueryService.queryAllOrder();
         List<DistriOrderMessage> appTradeOrderDetailRespVos = tradeOrderQueryService.queryAllOrder(orderIds);
-        CalcMessage calcMessage = CalcMessage.builder().distriOrderMessages(appTradeOrderDetailRespVos).build();
+
+
+        Map<Long, List<OrderItemMessage>> orderItemMessageGroupBy = appTradeOrderDetailRespVos.stream()
+                .map(k -> OrderItemMessage.builder().price(k.getPrice())
+                        .productCount(k.getProductCount())
+                        .costPrice(k.getCostPrice())
+                        .orderId(k.getOrderId())
+                        .count(k.getCount())
+                        .totalPrice(k.getTotalPrice()).build())
+                .collect(Collectors.groupingBy(OrderItemMessage::getOrderId));
+
+
+
+
+        List<OrderCalcMessage> orderCalcMessages = appTradeOrderDetailRespVos.stream().distinct().map(k -> {
+            OrderCalcMessage orderCalcMessage = OrderCalcMessage.builder()
+                    .orderId(k.getOrderId())
+                    .name(k.getName())
+                    .nickName(k.getNickName())
+                    .no(k.getNo())
+                    .merchantId(k.getMerchantId())
+                    .productCount(k.getProductCount())
+                    .shopId(k.getShopId())
+                    .userId(k.getUserId()).build();
+            List<OrderItemMessage> orderItemMessages = orderItemMessageGroupBy.get(k.getOrderId());
+            orderCalcMessage.setOrderItemMessages(orderItemMessages);
+            return orderCalcMessage;
+        }).collect(Collectors.toList());
+
+
+        CalcMessage calcMessage = CalcMessage.builder().orderCalcMessages(orderCalcMessages).distriOrderMessages(appTradeOrderDetailRespVos).build();
         distriOrderProducer.sendDistriOrderMessage(calcMessage);
+
         return success("success");
     }
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/mysql/aftersale/AfterSaleMapper.java

@@ -53,10 +53,9 @@ public interface AfterSaleMapper extends BaseMapperX<AfterSaleDO> {
                 .in(AfterSaleDO::getStatus, statuses));
     }
 
-    default Long selectCountByUserIdAndStatus(Long userId, Long shopId, Long merId, Collection<Integer> statuses) {
+    default Long selectCountByUserIdAndStatus(Long userId, Long merId, Collection<Integer> statuses) {
         return selectCount(new LambdaQueryWrapperX<AfterSaleDO>()
                 .eqIfPresent(AfterSaleDO::getUserId, userId)
-                .eqIfPresent(AfterSaleDO::getShopId, shopId)
                 .eqIfPresent(AfterSaleDO::getMerchantId, merId)
                 .in(AfterSaleDO::getStatus, statuses));
     }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/job/order/TradeOrderAutoCalcJob.java

@@ -11,7 +11,6 @@ import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -39,16 +38,19 @@ public class TradeOrderAutoCalcJob implements JobHandler {
                 .map(k -> OrderItemMessage.builder().price(k.getPrice())
                         .productCount(k.getProductCount())
                         .costPrice(k.getCostPrice())
+                        .orderId(k.getOrderId())
+                        .count(k.getCount())
                         .totalPrice(k.getTotalPrice()).build())
                 .collect(Collectors.groupingBy(OrderItemMessage::getOrderId));
 
-        List<OrderCalcMessage> orderCalcMessages = appTradeOrderDetailRespVos.stream().map(k -> {
+        List<OrderCalcMessage> orderCalcMessages = appTradeOrderDetailRespVos.stream().distinct().map(k -> {
             OrderCalcMessage orderCalcMessage = OrderCalcMessage.builder()
                     .orderId(k.getOrderId())
                     .name(k.getName())
                     .nickName(k.getNickName())
                     .no(k.getNo())
                     .merchantId(k.getMerchantId())
+                    .productCount(k.getProductCount())
                     .shopId(k.getShopId())
                     .userId(k.getUserId()).build();
             List<OrderItemMessage> orderItemMessages = orderItemMessageGroupBy.get(k.getOrderId());
@@ -59,7 +61,7 @@ public class TradeOrderAutoCalcJob implements JobHandler {
 
         CalcMessage calcMessage = CalcMessage.builder().orderCalcMessages(orderCalcMessages).distriOrderMessages(appTradeOrderDetailRespVos).build();
         distriOrderProducer.sendDistriOrderMessage(calcMessage);
-        return String.format("计算订单信息结束");
+        return "计算订单信息结束";
 
 
     }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleService.java

@@ -137,11 +137,10 @@ public interface AfterSaleService {
      * 【会员】获得正在进行中的售后订单数量
      *
      * @param userId 用户编号
-     * @param shopId 店铺编号
      * @param merId  商户编号
      * @return 数量
      */
-    Long getApplyingAfterSaleCount(Long userId,Long shopId, Long merId);
+    Long getApplyingAfterSaleCount(Long userId, Long merId);
 
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -423,8 +423,8 @@ public class AfterSaleServiceImpl implements AfterSaleService {
     }
 
     @Override
-    public Long getApplyingAfterSaleCount(Long userId,Long shopId, Long merId) {
-        return tradeAfterSaleMapper.selectCountByUserIdAndStatus(userId, shopId, merId, AfterSaleStatusEnum.APPLYING_STATUSES);
+    public Long getApplyingAfterSaleCount(Long userId, Long merId) {
+        return tradeAfterSaleMapper.selectCountByUserIdAndStatus(userId, merId, AfterSaleStatusEnum.APPLYING_STATUSES);
     }
 
 }

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

@@ -14,6 +14,7 @@
         <result column="orderId" property="orderId"/>
         <result column="name" property="name"/>
         <result column="nickName" property="nickName"/>
+        <result column="count" property="count"/>
 
 
     </resultMap>
@@ -30,7 +31,8 @@
                ps.shop_id        as shopId,
                ps.shop_id        as shopId,
                mu.`name`         as name,
-               mu.nickname       as nickname
+               mu.nickname       as nickname,
+               toi.count  as `count`
         from trade_order tor
                  LEFT JOIN member_user mu
                            ON tor.user_id = mu.id
@@ -57,7 +59,8 @@
         ps.shop_id as shopId,
         ps.shop_id as shopId,
         mu.`name` as name,
-        mu.nickname as nickname
+        mu.nickname as nickname,
+        toi.count as `count`
         from trade_order tor
         LEFT JOIN member_user mu
         ON tor.user_id = mu.id

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/admin/user/vo/MemberUserRespVO.java

@@ -67,9 +67,12 @@ public class MemberUserRespVO extends MemberUserBaseVO {
     @Schema(description = "未来身价值，未来身价值=当前身价值+预增加身价值")
     private Long futureMemberWorthValue;
 
-    @Schema(description = "当前身价级别名称", example = "张三")
+    @Schema(description = "当前身价级别名称", example = "黄金")
     private String currentMemberWorthLevelName;
 
+    @Schema(description = "当前身价级别", example = "等级一")
+    private String currentMemberWorthLevel;
+
     @Schema(description = "当前身价级别id", example = "24146")
     private Long currentMemberWorthLevelId;
 

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/dal/mysql/permission/RoleMapper.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.system.dal.mysql.permission;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.framework.common.util.collection.CollectionUtils;
 import cn.newfeifan.mall.framework.mybatis.core.dataobject.BaseDO;
 import cn.newfeifan.mall.framework.mybatis.core.mapper.BaseMapperX;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -9,10 +10,7 @@ import cn.newfeifan.mall.module.system.dal.dataobject.permission.RoleDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.lang.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @Mapper
 public interface RoleMapper extends BaseMapperX<RoleDO> {
@@ -39,7 +37,10 @@ public interface RoleMapper extends BaseMapperX<RoleDO> {
         return selectList(RoleDO::getStatus, statuses);
     }
 
-    default List<String> selectByRoleIds(Set<Long> roleIds){
+    default List<String> selectByRoleIds(Set<Long> roleIds) {
+        if (roleIds.isEmpty()) {
+            return Collections.emptyList();
+        }
         List<RoleDO> roleDOS = selectList(new LambdaQueryWrapperX<RoleDO>()
                 .inIfPresent(RoleDO::getId, roleIds));
         List<String> strings = new ArrayList<>();

feifan-module-system/feifan-module-system-biz/src/main/java/cn/newfeifan/mall/module/system/service/permission/PermissionServiceImpl.java

@@ -231,7 +231,8 @@ public class PermissionServiceImpl implements PermissionService {
 
     @Override
     public Set<Long> getUserRoleIdListByUserId(Long userId) {
-        return convertSet(userRoleMapper.selectListByUserId(userId), UserRoleDO::getRoleId);
+        List<UserRoleDO> from = userRoleMapper.selectListByUserId(userId);
+        return convertSet(from, UserRoleDO::getRoleId);
     }
 
     @Override