Merge branch 'dev/2024/0428/update-app' into 'master'

获取身价的信息返回修改

See merge request zx-mall/mall-backend-app!10

feifan-framework/feifan-common/src/main/java/cn/newfeifan/mall/framework/common/exception/enums/GlobalErrorCodeConstants.java

@@ -38,4 +38,6 @@ public interface GlobalErrorCodeConstants {
 
     ErrorCode UNKNOWN = new ErrorCode(999, "未知错误");
 
+    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/constant/DistriConstants.java

@@ -17,4 +17,6 @@ public class DistriConstants {
     public static final Double ONE_HUNDRED = 1d;
     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/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/vo/DuserInfoVO.java

@@ -24,4 +24,19 @@ public class DuserInfoVO {
     @Schema(description = "团队历史总贡献值=直推奖+合赢奖", example = "88")
     private Long descTotalPrice;
 
+    @Schema(description = "身价距下一级所需点数")
+    private Long socialUpNeed;
+
+    @Schema(description = "团队用户当前身价id", example = "22096")
+    private Long socialStatusId;
+
+    @Schema(description = "团队用户当前身价等级", example = "等级一")
+    private String socialStatusLevel;
+
+    @Schema(description = "团队用户当前身价等级名称", example = "白银")
+    private String socialStatusLevelName;
+
+    @Schema(description = "团队用户当前点数")
+    private Long socialStatusPoint;
+
 }

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;
@@ -43,4 +42,9 @@ public class DuserPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "用户名称", example = "张三")
+    private String nickName;
+
+    @Schema(description = "身价距下一级所需点数")
+    private Long socialUpNeed;
 }

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

@@ -2,9 +2,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 java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
@@ -37,9 +34,9 @@ public class DuserRespVO {
     @ExcelProperty("团队用户当前积分")
     private Long integralId;
 
-    @Schema(description = "团队用户当前身价(等级)", example = "2")
+    @Schema(description = "团队用户当前身价id", example = "22096")
     @ExcelProperty("团队用户当前身价(等级)")
-    private Integer socialStatus;
+    private Long socialStatusId;
 
     @Schema(description = "团队用户当前点数")
     @ExcelProperty("团队用户当前点数")
@@ -49,6 +46,14 @@ public class DuserRespVO {
     @ExcelProperty("用户类型")
     private Long categoryId;
 
+    @Schema(description = "用户名称", example = "张三")
+    @ExcelProperty("用户名称")
+    private String nickName;
+
+    @Schema(description = "身价距下一级所需点数")
+    @ExcelProperty("身价距下一级所需点数")
+    private Long socialUpNeed;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

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

@@ -34,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;
@@ -47,4 +47,6 @@ public class DuserSaveReqVO {
     @Schema(description = "用户名称", example = "张三")
     private String nickName;
 
+    @Schema(description = "身价距下一级所需点数")
+    private Long socialUpNeed;
 }

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

@@ -27,6 +27,19 @@ public class OrderPercentageDoubleSaveReqVO {
 
     @Schema(description = "分成百分比")
     private Double 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;
 

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,6 +32,18 @@ public class OrderPercentagePageReqVO extends PageParam {
     @Schema(description = "分成百分比")
     private Integer 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;

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,6 +38,22 @@ public class OrderPercentageRespVO {
     @ExcelProperty("分成百分比")
     private Integer 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;

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,6 +27,19 @@ public class OrderPercentageSaveReqVO {
 
     @Schema(description = "分成百分比")
     private Integer 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;
 

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/controller/app/sharepath/vo/SharePathRespVO.java

@@ -61,4 +61,10 @@ public class SharePathRespVO {
     @Schema(description = "头像")
     private String avatar;
 
+    @Schema(description = "身价等级")
+    private String socialStatusLevel;
+
+    @Schema(description = "身价等级名称")
+    private String socialStatusLevelName;
+
 }

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

@@ -45,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,23 @@ public class OrderPercentageDO extends BaseDO {
      */
     private String divideIntoPerc;
 
+    /**
+     * 购物订单：直推人身价提升
+     */
+    private String orderAncestorSocialStatus;
+    /**
+     * 购物订单：本人身价提升
+     */
+    private String orderUserSocialStatus;
+    /**
+     * 新用户注册：直推人身价提升
+     */
+    private String registerAncestorSocialStatus;
+    /**
+     * 新用户注册：本人身价提升
+     */
+    private String registerSocialStatus;
+
     private Integer status;
 
 }

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

@@ -1,6 +1,5 @@
 package cn.newfeifan.mall.module.distri.dal.mysql.duser;
 
-import java.util.*;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -24,7 +23,7 @@ public interface DuserMapper extends BaseMapperX<DuserDO> {
                 .eqIfPresent(DuserDO::getMobile, reqVO.getMobile())
                 .eqIfPresent(DuserDO::getSource, reqVO.getSource())
                 .eqIfPresent(DuserDO::getIntegralId, reqVO.getIntegralId())
-                .eqIfPresent(DuserDO::getSocialStatus, reqVO.getSocialStatus())
+                .eqIfPresent(DuserDO::getSocialStatusId, reqVO.getSocialStatusId())
                 .eqIfPresent(DuserDO::getSocialStatusPoint, reqVO.getSocialStatusPoint())
                 .eqIfPresent(DuserDO::getCategoryId, reqVO.getCategoryId())
                 .betweenIfPresent(DuserDO::getCreateTime, reqVO.getCreateTime())

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/service/duser/DuserService.java

@@ -56,4 +56,8 @@ public interface DuserService {
     void hasUserAndCreat(Long userId);
 
     DuserInfoVO getDuserInfo(Long userId);
+
+    void updateDuserSocial(Long userId, Long social, Integer socialStatus);
+
+    DuserDO getDuserByUser(Long userId);
 }

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

@@ -2,18 +2,25 @@ package cn.newfeifan.mall.module.distri.service.duser;
 
 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.socialstatus.bo.SocialStatusBO;
 import cn.newfeifan.mall.module.distri.controller.app.sharepath.vo.SharePathSaveReqVO;
 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.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.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.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import cn.newfeifan.mall.module.distri.controller.admin.duser.vo.*;
@@ -24,8 +31,10 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.module.distri.dal.mysql.duser.DuserMapper;
 
 import java.util.List;
+import java.util.Objects;
 
 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.*;
 
 /**
@@ -49,6 +58,12 @@ public class DuserServiceImpl implements DuserService {
     @Resource
     private PtProfitLogService ptProfitLogService;
 
+    @Resource
+    private OrderPercentageMapper orderPercentageMapper;
+
+    @Resource
+    private SocialStatusChangeLogService socialStatusChangeLogService;
+
     @Override
     public Long createDuser(DuserSaveReqVO createReqVO) {
         // 插入
@@ -110,7 +125,8 @@ public class DuserServiceImpl implements DuserService {
 
     @Override
     public DuserInfoVO getDuserInfo(Long userId) {
-
+        DuserDO duser = getDuserByUser(userId);
+        SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
 
         hasUserAndCreat(userId);
         // 先初始化
@@ -135,8 +151,15 @@ public class DuserServiceImpl implements DuserService {
             totalLog = ptProfitLogService.getTotalLog(sonsId);
         }
 
-        return duserInfoVOBuilder.descPrice(Long.parseLong(yesterday))
-                .descTotalPrice(Long.parseLong(totalLog)).build();
+        return duserInfoVOBuilder
+                .descPrice(Long.parseLong(yesterday))
+                .descTotalPrice(Long.parseLong(totalLog))
+                .socialUpNeed(duser.getSocialUpNeed())
+                .socialStatusId(duser.getSocialStatusId())
+                .socialStatusPoint(duser.getSocialStatusPoint())
+                .socialStatusLevel(socialStatus.getLevel())
+                .socialStatusLevelName(socialStatus.getName())
+                .build();
 
     }
 
@@ -158,6 +181,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)
@@ -166,11 +192,39 @@ 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);
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    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 DuserDO getDuserByUser(Long id) {
+        return duserMapper.selectOne(new LambdaQueryWrapperX<DuserDO>().eq(DuserDO::getUserId, id));
+    }
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/integral/IntegralServiceImpl.java

@@ -13,14 +13,12 @@ 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.integral.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 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.integral.IntegralMapper;
@@ -167,7 +165,7 @@ public class IntegralServiceImpl implements IntegralService {
         Integer socialStatusUpgradation = 0;
 
         DuserDO duser = duserMapper.selectOne("user_id", userId);
-        Integer oldSocialStatus = duser.getSocialStatus();//升级前身价等级
+        Long oldSocialStatus = duser.getSocialStatusId();//升级前身价等级
 
         return newSocialStatusName;
     }

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

@@ -3,7 +3,13 @@ package cn.newfeifan.mall.module.distri.service.sharepath;
 import cn.newfeifan.mall.framework.common.pojo.PageParam;
 import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.controller.app.sharepath.vo.*;
+import cn.newfeifan.mall.module.distri.dal.dataobject.duser.DuserDO;
+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.socialstatus.SocialStatusService;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
 import org.springframework.context.annotation.Lazy;
@@ -21,6 +27,7 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.module.distri.dal.mysql.sharepath.SharePathMapper;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -47,6 +54,12 @@ public class SharePathServiceImpl implements SharePathService {
     @Resource
     private MemberUserService memberUserService;
 
+    @Resource
+    private SocialStatusService socialStatusService;
+
+    @Resource
+    private OrderPercentageMapper orderPercentageMapper;
+
 
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
@@ -89,6 +102,9 @@ public class SharePathServiceImpl implements SharePathService {
                 descendant.getNickname(),
                 descendant.getMobile());
 
+        OrderPercentageDO orderPercentageDO = orderPercentageMapper.selectList().get(0);
+        duserService.updateDuserSocial(createReqVO.getAncestor(), Long.valueOf(orderPercentageDO.getRegisterAncestorSocialStatus()), SocialStatusEnum.REGISTER_ANCESTOR_SOCIAL.getStatus());
+
     }
 
     @Override
@@ -128,7 +144,10 @@ public class SharePathServiceImpl implements SharePathService {
                 .eq(SharePathDO::getDescendant, userId)
                 .eq(SharePathDO::getDepth, 1));
         SharePathRespVO ancestor = BeanUtils.toBean(sharePathDO, SharePathRespVO.class);
-        if(ancestor != null) ancestor.setAvatar(getAvatar(ancestor.getAncestor()));
+        if(ancestor != null) {
+            ancestor.setAvatar(getAvatar(ancestor.getAncestor()));
+            getSocialStatus(ancestor, ancestor.getAncestor());
+        }
 
         //获取团队成员
         PageResult<SharePathDO> descendants = sharePathMapper.selectPage(pageParam, new LambdaQueryWrapperX<SharePathDO>()
@@ -137,6 +156,7 @@ public class SharePathServiceImpl implements SharePathService {
         PageResult<SharePathRespVO> result = BeanUtils.toBean(descendants, SharePathRespVO.class);
         result.getList().forEach(item -> {
             item.setAvatar(getAvatar(item.getDescendant()));
+            getSocialStatus(item, item.getDescendant());
         });
 
 
@@ -146,6 +166,14 @@ public class SharePathServiceImpl implements SharePathService {
                 .descendants(result).build();
     }
 
+    private void getSocialStatus(SharePathRespVO sharePathRespVO,Long userId){
+        if(Objects.equals(userId, PT_ID)) return;
+        DuserDO duser = duserService.getDuserByUser(userId);
+        SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
+        sharePathRespVO.setSocialStatusLevel(socialStatus.getLevel());
+        sharePathRespVO.setSocialStatusLevelName(socialStatus.getName());
+    }
+
     private String getAvatar(Long userId) {
         return memberUserService.getUser(userId).getAvatar();
     }

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,13 @@ 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,25 @@ 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.enums.GlobalErrorCodeConstants.SOCIAL_STATUS_CHANGE_LOG_NOT_EXISTS;
+import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.newfeifan.mall.module.distri.constant.DistriConstants.IS_EFFECTIVE;
+
+/**
+ * 会员身价变化日志 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/socialstatuschangecategory/SocialStatusChangeCategoryServiceImplTest.java

@@ -1,146 +0,0 @@
-package cn.newfeifan.mall.module.distri.service.socialstatuschangecategory;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import javax.annotation.Resource;
-
-import cn.newfeifan.mall.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.newfeifan.mall.module.distri.controller.admin.socialstatuschangecategory.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.socialstatuschangecategory.SocialStatusChangeCategoryDO;
-import cn.newfeifan.mall.module.distri.dal.mysql.socialstatuschangecategory.SocialStatusChangeCategoryMapper;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-
-import javax.annotation.Resource;
-import org.springframework.context.annotation.Import;
-import java.util.*;
-import java.time.LocalDateTime;
-
-import static cn.hutool.core.util.RandomUtil.*;
-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 cn.newfeifan.mall.framework.common.util.date.DateUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-/**
- * {@link SocialStatusChangeCategoryServiceImpl} 的单元测试类
- *
- * @author 非繁人
- */
-@Import(SocialStatusChangeCategoryServiceImpl.class)
-public class SocialStatusChangeCategoryServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private SocialStatusChangeCategoryServiceImpl socialStatusChangeCategoryService;
-
-    @Resource
-    private SocialStatusChangeCategoryMapper socialStatusChangeCategoryMapper;
-
-    @Test
-    public void testCreateSocialStatusChangeCategory_success() {
-        // 准备参数
-        SocialStatusChangeCategorySaveReqVO createReqVO = randomPojo(SocialStatusChangeCategorySaveReqVO.class).setId(null);
-
-        // 调用
-        Long socialStatusChangeCategoryId = socialStatusChangeCategoryService.createSocialStatusChangeCategory(createReqVO);
-        // 断言
-        assertNotNull(socialStatusChangeCategoryId);
-        // 校验记录的属性是否正确
-        SocialStatusChangeCategoryDO socialStatusChangeCategory = socialStatusChangeCategoryMapper.selectById(socialStatusChangeCategoryId);
-        assertPojoEquals(createReqVO, socialStatusChangeCategory, "id");
-    }
-
-    @Test
-    public void testUpdateSocialStatusChangeCategory_success() {
-        // mock 数据
-        SocialStatusChangeCategoryDO dbSocialStatusChangeCategory = randomPojo(SocialStatusChangeCategoryDO.class);
-        socialStatusChangeCategoryMapper.insert(dbSocialStatusChangeCategory);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        SocialStatusChangeCategorySaveReqVO updateReqVO = randomPojo(SocialStatusChangeCategorySaveReqVO.class, o -> {
-            o.setId(dbSocialStatusChangeCategory.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        socialStatusChangeCategoryService.updateSocialStatusChangeCategory(updateReqVO);
-        // 校验是否更新正确
-        SocialStatusChangeCategoryDO socialStatusChangeCategory = socialStatusChangeCategoryMapper.selectById(updateReqVO.getId()); // 获取最新的
-        assertPojoEquals(updateReqVO, socialStatusChangeCategory);
-    }
-
-    @Test
-    public void testUpdateSocialStatusChangeCategory_notExists() {
-        // 准备参数
-        SocialStatusChangeCategorySaveReqVO updateReqVO = randomPojo(SocialStatusChangeCategorySaveReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> socialStatusChangeCategoryService.updateSocialStatusChangeCategory(updateReqVO), SOCIAL_STATUS_CHANGE_CATEGORY_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteSocialStatusChangeCategory_success() {
-        // mock 数据
-        SocialStatusChangeCategoryDO dbSocialStatusChangeCategory = randomPojo(SocialStatusChangeCategoryDO.class);
-        socialStatusChangeCategoryMapper.insert(dbSocialStatusChangeCategory);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbSocialStatusChangeCategory.getId();
-
-        // 调用
-        socialStatusChangeCategoryService.deleteSocialStatusChangeCategory(id);
-       // 校验数据不存在了
-       assertNull(socialStatusChangeCategoryMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteSocialStatusChangeCategory_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> socialStatusChangeCategoryService.deleteSocialStatusChangeCategory(id), SOCIAL_STATUS_CHANGE_CATEGORY_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetSocialStatusChangeCategoryPage() {
-       // mock 数据
-       SocialStatusChangeCategoryDO dbSocialStatusChangeCategory = randomPojo(SocialStatusChangeCategoryDO.class, o -> { // 等会查询到
-           o.setName(null);
-           o.setCode(null);
-           o.setVariationValue(null);
-           o.setDescription(null);
-           o.setCreateTime(null);
-       });
-       socialStatusChangeCategoryMapper.insert(dbSocialStatusChangeCategory);
-       // 测试 name 不匹配
-       socialStatusChangeCategoryMapper.insert(cloneIgnoreId(dbSocialStatusChangeCategory, o -> o.setName(null)));
-       // 测试 code 不匹配
-       socialStatusChangeCategoryMapper.insert(cloneIgnoreId(dbSocialStatusChangeCategory, o -> o.setCode(null)));
-       // 测试 variationValue 不匹配
-       socialStatusChangeCategoryMapper.insert(cloneIgnoreId(dbSocialStatusChangeCategory, o -> o.setVariationValue(null)));
-       // 测试 description 不匹配
-       socialStatusChangeCategoryMapper.insert(cloneIgnoreId(dbSocialStatusChangeCategory, o -> o.setDescription(null)));
-       // 测试 createTime 不匹配
-       socialStatusChangeCategoryMapper.insert(cloneIgnoreId(dbSocialStatusChangeCategory, o -> o.setCreateTime(null)));
-       // 准备参数
-       SocialStatusChangeCategoryPageReqVO reqVO = new SocialStatusChangeCategoryPageReqVO();
-       reqVO.setName(null);
-       reqVO.setCode(null);
-       reqVO.setVariationValue(null);
-       reqVO.setDescription(null);
-       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-
-       // 调用
-       PageResult<SocialStatusChangeCategoryDO> pageResult = socialStatusChangeCategoryService.getSocialStatusChangeCategoryPage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbSocialStatusChangeCategory, pageResult.getList().get(0));
-    }
-
-}

feifan-module-distri/feifan-module-distri-biz/src/test/java/cn/newfeifan/mall/module/distri/service/usercollectbefore/UserCollectBeforeServiceImplTest.java

@@ -1,138 +0,0 @@
-package cn.newfeifan.mall.module.distri.service.usercollectbefore;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.mock.mockito.MockBean;
-
-import javax.annotation.Resource;
-
-import cn.newfeifan.mall.framework.test.core.ut.BaseDbUnitTest;
-
-import cn.newfeifan.mall.module.distri.controller.admin.usercollectbefore.vo.*;
-import cn.newfeifan.mall.module.distri.dal.dataobject.usercollectbefore.UserCollectBeforeDO;
-import cn.newfeifan.mall.module.distri.dal.mysql.usercollectbefore.UserCollectBeforeMapper;
-import cn.newfeifan.mall.framework.common.pojo.PageResult;
-
-import javax.annotation.Resource;
-import org.springframework.context.annotation.Import;
-import java.util.*;
-import java.time.LocalDateTime;
-
-import static cn.hutool.core.util.RandomUtil.*;
-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 cn.newfeifan.mall.framework.common.util.date.DateUtils.*;
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-/**
- * {@link UserCollectBeforeServiceImpl} 的单元测试类
- *
- * @author 非繁人
- */
-@Import(UserCollectBeforeServiceImpl.class)
-public class UserCollectBeforeServiceImplTest extends BaseDbUnitTest {
-
-    @Resource
-    private UserCollectBeforeServiceImpl userCollectBeforeService;
-
-    @Resource
-    private UserCollectBeforeMapper userCollectBeforeMapper;
-
-    @Test
-    public void testCreateUserCollectBefore_success() {
-        // 准备参数
-        UserCollectBeforeSaveReqVO createReqVO = randomPojo(UserCollectBeforeSaveReqVO.class).setId(null);
-
-        // 调用
-        Long userCollectBeforeId = userCollectBeforeService.createUserCollectBefore(createReqVO);
-        // 断言
-        assertNotNull(userCollectBeforeId);
-        // 校验记录的属性是否正确
-        UserCollectBeforeDO userCollectBefore = userCollectBeforeMapper.selectById(userCollectBeforeId);
-        assertPojoEquals(createReqVO, userCollectBefore, "id");
-    }
-
-    @Test
-    public void testUpdateUserCollectBefore_success() {
-        // mock 数据
-        UserCollectBeforeDO dbUserCollectBefore = randomPojo(UserCollectBeforeDO.class);
-        userCollectBeforeMapper.insert(dbUserCollectBefore);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        UserCollectBeforeSaveReqVO updateReqVO = randomPojo(UserCollectBeforeSaveReqVO.class, o -> {
-            o.setId(dbUserCollectBefore.getId()); // 设置更新的 ID
-        });
-
-        // 调用
-        userCollectBeforeService.updateUserCollectBefore(updateReqVO);
-        // 校验是否更新正确
-        UserCollectBeforeDO userCollectBefore = userCollectBeforeMapper.selectById(updateReqVO.getId()); // 获取最新的
-        assertPojoEquals(updateReqVO, userCollectBefore);
-    }
-
-    @Test
-    public void testUpdateUserCollectBefore_notExists() {
-        // 准备参数
-        UserCollectBeforeSaveReqVO updateReqVO = randomPojo(UserCollectBeforeSaveReqVO.class);
-
-        // 调用, 并断言异常
-        assertServiceException(() -> userCollectBeforeService.updateUserCollectBefore(updateReqVO), USER_COLLECT_BEFORE_NOT_EXISTS);
-    }
-
-    @Test
-    public void testDeleteUserCollectBefore_success() {
-        // mock 数据
-        UserCollectBeforeDO dbUserCollectBefore = randomPojo(UserCollectBeforeDO.class);
-        userCollectBeforeMapper.insert(dbUserCollectBefore);// @Sql: 先插入出一条存在的数据
-        // 准备参数
-        Long id = dbUserCollectBefore.getId();
-
-        // 调用
-        userCollectBeforeService.deleteUserCollectBefore(id);
-       // 校验数据不存在了
-       assertNull(userCollectBeforeMapper.selectById(id));
-    }
-
-    @Test
-    public void testDeleteUserCollectBefore_notExists() {
-        // 准备参数
-        Long id = randomLongId();
-
-        // 调用, 并断言异常
-        assertServiceException(() -> userCollectBeforeService.deleteUserCollectBefore(id), USER_COLLECT_BEFORE_NOT_EXISTS);
-    }
-
-    @Test
-    @Disabled  // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
-    public void testGetUserCollectBeforePage() {
-       // mock 数据
-       UserCollectBeforeDO dbUserCollectBefore = randomPojo(UserCollectBeforeDO.class, o -> { // 等会查询到
-           o.setProductSpuId(null);
-           o.setUserId(null);
-           o.setCreateTime(null);
-       });
-       userCollectBeforeMapper.insert(dbUserCollectBefore);
-       // 测试 productSpuId 不匹配
-       userCollectBeforeMapper.insert(cloneIgnoreId(dbUserCollectBefore, o -> o.setProductSpuId(null)));
-       // 测试 userId 不匹配
-       userCollectBeforeMapper.insert(cloneIgnoreId(dbUserCollectBefore, o -> o.setUserId(null)));
-       // 测试 createTime 不匹配
-       userCollectBeforeMapper.insert(cloneIgnoreId(dbUserCollectBefore, o -> o.setCreateTime(null)));
-       // 准备参数
-       UserCollectBeforePageReqVO reqVO = new UserCollectBeforePageReqVO();
-       reqVO.setProductSpuId(null);
-       reqVO.setUserId(null);
-       reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
-
-       // 调用
-       PageResult<UserCollectBeforeDO> pageResult = userCollectBeforeService.getUserCollectBeforePage(reqVO);
-       // 断言
-       assertEquals(1, pageResult.getTotal());
-       assertEquals(1, pageResult.getList().size());
-       assertPojoEquals(dbUserCollectBefore, pageResult.getList().get(0));
-    }
-
-}

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -29,7 +29,6 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.annotation.Resource;
@@ -126,20 +125,14 @@ public class MemberUserServiceImpl implements MemberUserService {
 
     @Transactional(rollbackFor = Exception.class)
     public void registerTransactionSynchronization(Long userId, Long linkId) {
-        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
+        // 发送 消息：用户创建
+        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
             @Override
             public void afterCommit() {
                 sharePathProducer.sendSharePathCreatMessage(linkId, userId);
                 if (linkId != null) {
                     shareLinkRegisterProducer.sendShareLinkRegisterMessage(linkId, userId);
                 }
-            }
-        });
-
-        // 发送 MQ 消息：用户创建
-        TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-            @Override
-            public void afterCommit() {
                 memberUserProducer.sendUserCreateMessage(userId);
             }
         });