Merge branch 'dev/2024/0428/update-admin' of Harper/feifan-backend-zx-admin into master

获取身价的信息返回修改

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

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

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

@@ -43,7 +43,8 @@ public class OrderPercentageDoubleSaveReqVO {
     @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

@@ -49,4 +49,7 @@ public class OrderPercentagePageReqVO extends PageParam {
     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

@@ -59,4 +59,7 @@ public class OrderPercentageRespVO {
     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

@@ -43,8 +43,8 @@ public class OrderPercentageSaveReqVO {
     @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/dal/dataobject/orderpercentage/OrderPercentageDO.java

@@ -68,4 +68,9 @@ public class OrderPercentageDO extends BaseDO {
 
     private Integer status;
 
+    /**
+     * 用户注册后，获得的基础最大合赢奖、直推奖积分限额
+     */
+    private String baseMaxQuota;
+
 }

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

@@ -175,6 +175,7 @@ public class DuserServiceImpl implements DuserService {
             memberUserRespVO.setCurrentMemberWorthLevel(socialStatus.getLevel());
             //获取钱包
             IntegralDO integral = integralService.getIntegral(memberUserRespVO.getId());
+            if(integral == null) continue;
             memberUserRespVO.setCurrentMemberPoints(integral.getCurrentQuota());
         }
         return result;
@@ -270,8 +271,9 @@ public class DuserServiceImpl implements DuserService {
                     .nickName(user.getNickname())
                     .integralId(integralDO.getId())
                     .source(userId)
-                    .socialStatusId(1L)
-                    .socialStatusPoint(0L)
+                    .socialStatusPoint(Long.valueOf(orderPercentageDO.getRegisterSocialStatus()))
+                    .socialStatusId(socialStatusBO.getId())
+                    .socialUpNeed(socialStatusBO.getSocialUpNeed())
                     .build();
             duserMapper.insert(BeanUtils.toBean(duserSaveReqVO, DuserDO.class));
 
@@ -298,6 +300,11 @@ public class DuserServiceImpl implements DuserService {
             );
             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());
         }
     }
 }