Merge branch 'dev/2024/0425/update-app-comment' of Harper/feifan-backend-zx-app into master

修改积分的字段类型为Long

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

@@ -19,9 +19,9 @@ public class DuserInfoVO {
     private Integer descNo;
 
     @Schema(description = "团队昨日贡献值=直推奖+合赢奖", example = "88")
-    private Integer descPrice;
+    private Long descPrice;
 
     @Schema(description = "团队历史总贡献值=直推奖+合赢奖", example = "88")
-    private Integer descTotalPrice;
+    private Long descTotalPrice;
 
 }

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.integral.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;
@@ -19,10 +18,10 @@ public class IntegralPageReqVO extends PageParam {
     private Long userId;
 
     @Schema(description = "当前积分")
-    private Integer currentQuota;
+    private Long currentQuota;
 
     @Schema(description = "冻结积分")
-    private Integer freezeQuota;
+    private Long freezeQuota;
 
     @Schema(description = "用户类型", example = "17348")
     private Long categoryId;

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

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.integral.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.*;
 
@@ -23,11 +20,11 @@ public class IntegralRespVO {
 
     @Schema(description = "当前积分")
     @ExcelProperty("当前积分")
-    private Integer currentQuota;
+    private Long currentQuota;
 
     @Schema(description = "冻结积分")
     @ExcelProperty("冻结积分")
-    private Integer freezeQuota;
+    private Long freezeQuota;
 
     @Schema(description = "用户类型", example = "17348")
     @ExcelProperty("用户类型")

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

@@ -18,16 +18,16 @@ public class IntegralSaveReqVO {
     private Long userId;
 
     @Schema(description = "当前积分")
-    private Integer currentQuota;
+    private Long currentQuota;
 
     @Schema(description = "冻结积分")
-    private Integer freezeQuota;
+    private Long freezeQuota;
 
     @Schema(description = "用户类型", example = "17348")
     private Long categoryId;
 
     @Schema(description = "最高可获取积分")
-    private Integer highQuota;
+    private Long highQuota;
 
 
     @Schema(description = "用户名称", example = "赵六")

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

@@ -31,17 +31,17 @@ public class IntegralDO extends BaseDO {
     /**
      * 当前积分
      */
-    private Integer currentQuota;
+    private Long currentQuota;
     /**
      * 冻结积分
      */
-    private Integer freezeQuota;
+    private Long freezeQuota;
     /**
      * 用户类型
      */
     private Long categoryId;
 
-    private Integer highQuota;
+    private Long highQuota;
 
     private String name;
 
@@ -50,6 +50,6 @@ public class IntegralDO extends BaseDO {
     /**
      * 合赢奖累计获取积分
      */
-    private Integer accumulatedQuota = 0;
+    private Long accumulatedQuota = 0L;
 
 }

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

@@ -135,8 +135,8 @@ public class DuserServiceImpl implements DuserService {
             totalLog = ptProfitLogService.getTotalLog(sonsId);
         }
 
-        return duserInfoVOBuilder.descPrice(Integer.parseInt(yesterday))
-                .descTotalPrice(Integer.parseInt(totalLog)).build();
+        return duserInfoVOBuilder.descPrice(Long.parseLong(yesterday))
+                .descTotalPrice(Long.parseLong(totalLog)).build();
 
     }
 
@@ -148,10 +148,10 @@ public class DuserServiceImpl implements DuserService {
         if (integralDO == null) {
             // 创建一个钱包
             IntegralSaveReqVO integralSaveReqVO = IntegralSaveReqVO.builder()
-                    .currentQuota(0)
+                    .currentQuota(0L)
                     .nickName(user.getNickname())
                     .name(user.getName())
-                    .freezeQuota(0)
+                    .freezeQuota(0L)
                     .categoryId(3L)
                     .userId(userId).build();
             Long integralId = integralService.createIntegral(integralSaveReqVO);

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java

@@ -25,7 +25,7 @@ public class AppTradeOrderSettlementRespVO {
     Map<Long,String> shopNameMap;
 
     @Schema(description = "用户当前积分值", requiredMode = Schema.RequiredMode.REQUIRED, example = "98760000")
-    private Integer currentQuota;
+    private Long currentQuota;
 
     @Schema(description = "交易类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") // 对应 TradeOrderTypeEnum 枚举
     private Integer type;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -308,7 +308,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
 //        MemberUserDO memberUserDO = memberUserMapper.selectById(userId);
 //        Long memberPoints = memberUserDO.getCurrentMemberPoints();//用户当前积分
         IntegralDO integralDO = integralMapper.selectOne("user_id", userId);//查询出用户积分相关信息
-        Integer currentQuota = integralDO.getCurrentQuota();//获取用户当前积分
+        Long currentQuota = integralDO.getCurrentQuota();//获取用户当前积分
 
         // 3. 拼接返回
         AppTradeOrderSettlementRespVO respVO = TradeOrderConvert.INSTANCE.convert(calculateRespBO, address);