获取身价的信息返回修改

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,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("团队用户当前点数")

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/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/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/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 接口
@@ -90,4 +92,6 @@ public interface DuserService {
     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,5 +1,6 @@
 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;
@@ -7,6 +8,7 @@ import cn.newfeifan.mall.module.distri.controller.admin.socialstatus.bo.SocialSt
 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;
@@ -15,6 +17,9 @@ 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;
@@ -34,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.*;
 
 /**
@@ -136,7 +142,7 @@ public class DuserServiceImpl implements DuserService {
     public void updateDuserSocial(Long userId, Long social, Integer socialStatus) {
 
         //平台不参与身价
-        if(userId == 1L){
+        if(Objects.equals(userId, PT_ID)){
             return;
         }
 
@@ -144,11 +150,34 @@ public class DuserServiceImpl implements DuserService {
         DuserDO duser = getDuserByUser(userId);
         duser.setSocialStatusPoint(duser.getSocialStatusPoint() + social);
 
-        SocialStatusBO socialStatusBO = socialStatusService.getSocialStatusId(duser.getSocialStatusPoint());
+        SocialStatusBO socialStatusBO = socialStatusService.calculateSocial(duser.getSocialStatusPoint());
         duser.setSocialUpNeed(socialStatusBO.getSocialUpNeed());
-        duser.setSocialStatus(Math.toIntExact(socialStatusBO.getId()));
+        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());
+            SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
+            if(socialStatus == null) continue;
+            memberUserRespVO.setCurrentMemberWorthLevelName(socialStatus.getName());
+            memberUserRespVO.setCurrentMemberWorthLevel(socialStatus.getLevel());
+            //获取钱包
+            IntegralDO integral = integralService.getIntegral(memberUserRespVO.getId());
+            memberUserRespVO.setCurrentMemberPoints(integral.getCurrentQuota());
+        }
+        return result;
     }
 
     @Override
@@ -231,7 +260,7 @@ public class DuserServiceImpl implements DuserService {
         }
         if (duserDO == null) {
             OrderPercentageDO orderPercentageDO = orderPercentageMapper.selectList().get(0);
-            SocialStatusBO socialStatusBO = socialStatusService.getSocialStatusId(Long.valueOf(orderPercentageDO.getRegisterSocialStatus()));
+            SocialStatusBO socialStatusBO = socialStatusService.calculateSocial(Long.valueOf(orderPercentageDO.getRegisterSocialStatus()));
 
             // 创建一个新的营销用户
             DuserSaveReqVO duserSaveReqVO = DuserSaveReqVO.builder()
@@ -241,12 +270,11 @@ public class DuserServiceImpl implements DuserService {
                     .nickName(user.getNickname())
                     .integralId(integralDO.getId())
                     .source(userId)
-                    .socialStatus(1L)
+                    .socialStatusId(1L)
                     .socialStatusPoint(0L)
                     .build();
             duserMapper.insert(BeanUtils.toBean(duserSaveReqVO, DuserDO.class));
 
-            duserMapper.insert(BeanUtils.toBean(duserSaveReqVO, DuserDO.class));
             socialStatusChangeLogService.createSocialStatusChangeLog(userId, Long.valueOf(orderPercentageDO.getRegisterAncestorSocialStatus()),userId, SocialStatusEnum.REGISTER_SOCIAL);
         }
     }

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

@@ -5,11 +5,13 @@ 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;
@@ -71,6 +73,9 @@ public class SharePathServiceImpl implements SharePathService {
     @Resource
     private OrderPercentageMapper orderPercentageMapper;
 
+    @Resource
+    private SocialStatusService socialStatusService;
+
     @Override
     public Long createSharePath(SharePathSaveReqVO createReqVO) {
         // 插入
@@ -240,6 +245,12 @@ public class SharePathServiceImpl implements SharePathService {
         IntegralDO integral = integralService.getIntegralByUserId(userId);
         if (integral != null) memberUserRespVO.setCurrentQuota(integral.getCurrentQuota());
 
+        DuserDO duser = duserService.getDuserByUser(memberUserRespVO.getId());
+        SocialStatusDO socialStatus = socialStatusService.getSocialStatus(duser.getSocialStatusId());
+        if(socialStatus == null) return memberUserRespVO;
+        memberUserRespVO.setCurrentMemberWorthLevelName(socialStatus.getName());
+        memberUserRespVO.setCurrentMemberWorthLevel(socialStatus.getLevel());
+
         return memberUserRespVO;
     }
 

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

@@ -59,6 +59,6 @@ public interface SocialStatusService {
      * @param point 用户当前身价
      * @return 身价对象
      */
-    SocialStatusBO getSocialStatusId(Long point);
+    SocialStatusBO calculateSocial(Long point);
 
 }

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

@@ -75,7 +75,7 @@ public class SocialStatusServiceImpl implements SocialStatusService {
     }
 
     @Override
-    public SocialStatusBO getSocialStatusId(Long point) {
+    public SocialStatusBO calculateSocial(Long point) {
         List<SocialStatusDO> socialStatusDOS = socialStatusMapper.selectList(new LambdaQueryWrapper<SocialStatusDO>()
                 .orderByAsc(SocialStatusDO::getPoint)
         );
@@ -83,8 +83,13 @@ public class SocialStatusServiceImpl implements SocialStatusService {
         SocialStatusBO socialStatusBO = SocialStatusBO.builder().build();
         for (int i = 0; i < socialStatusDOS.size(); i++) {
             if (point < socialStatusDOS.get(i).getPoint()) {
-                socialStatusBO.setId(socialStatusDOS.get(i).getId());
-                socialStatusBO.setSocialUpNeed(socialStatusDOS.get(i + 1).getPoint() - point);
+                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-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;