Merge branch 'dev/2024/0423/update-admin' into 'master'

修改营销模块的字段改成Long类型

See merge request zx-mall/mall-backend-admin!5

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

@@ -19,8 +19,8 @@ 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;
@@ -32,7 +31,7 @@ public class IntegralPageReqVO extends PageParam {
     private LocalDateTime[] createTime;
 
     @Schema(description = "最高可获取积分")
-    private Integer highQuota;
+    private Long highQuota;
 
     @Schema(description = "用户名称", example = "赵六")
     private String name;

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("用户类型")
@@ -39,7 +36,7 @@ public class IntegralRespVO {
 
     @Schema(description = "最高可获取积分")
     @ExcelProperty("最高可获取积分")
-    private Integer highQuota;
+    private Long highQuota;
     @Schema(description = "用户名称", example = "赵六")
     @ExcelProperty("用户名称")
     private String name;

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

@@ -3,8 +3,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 javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 推荐用户积分新增/修改 Request VO")
 @Data
@@ -20,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/controller/admin/ordercalc/vo/OrderCalcPageReqVO.java

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ordercalc.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;
@@ -22,25 +21,25 @@ public class OrderCalcPageReqVO extends PageParam {
     private Long userId;
 
     @Schema(description = "售价", example = "10413")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "成本")
-    private Integer cost;
+    private Long cost;
 
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
-    private Integer grossProfit;
+    private Long grossProfit;
 
     @Schema(description = "推广-用户额度")
-    private Integer grossProfitUserQuota;
+    private Long grossProfitUserQuota;
 
     @Schema(description = "推广-推荐人额度")
-    private Integer grossProfitAncestorQuota;
+    private Long grossProfitAncestorQuota;
 
     @Schema(description = "推广-合赢奖额度(浮动)")
-    private Integer grossProfitBonusQuota;
+    private Long grossProfitBonusQuota;
 
     @Schema(description = "推广-平台分成额度(浮动)")
-    private Integer grossProfitPlatformQuota;
+    private Long grossProfitPlatformQuota;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

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

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.ordercalc.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.*;
 
@@ -27,11 +24,11 @@ public class OrderCalcRespVO {
 
     @Schema(description = "售价", example = "10413")
     @ExcelProperty("售价")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "成本")
     @ExcelProperty("成本")
-    private Integer cost;
+    private Long cost;
 
     @Schema(description = "购买数量", example = "10152")
     @ExcelProperty("购买数量")
@@ -39,23 +36,23 @@ public class OrderCalcRespVO {
 
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
     @ExcelProperty("毛利 = 成本 * 0.38... (推广费用)")
-    private Integer grossProfit;
+    private Long grossProfit;
 
     @Schema(description = "推广-用户额度")
     @ExcelProperty("推广-用户额度")
-    private Integer grossProfitUserQuota;
+    private Long grossProfitUserQuota;
 
     @Schema(description = "推广-推荐人额度")
     @ExcelProperty("推广-推荐人额度")
-    private Integer grossProfitAncestorQuota;
+    private Long grossProfitAncestorQuota;
 
     @Schema(description = "推广-合赢奖额度(浮动)")
     @ExcelProperty("推广-合赢奖额度(浮动)")
-    private Integer grossProfitBonusQuota;
+    private Long grossProfitBonusQuota;
 
     @Schema(description = "推广-平台分成额度(浮动)")
     @ExcelProperty("推广-平台分成额度(浮动)")
-    private Integer grossProfitPlatformQuota;
+    private Long grossProfitPlatformQuota;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

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

@@ -3,8 +3,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.ordercalc.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import java.util.*;
-import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 订单产生数据计算新增/修改 Request VO")
 @Data
@@ -23,25 +21,25 @@ public class OrderCalcSaveReqVO {
     private Long userId;
 
     @Schema(description = "售价", example = "10413")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "成本")
-    private Integer cost;
+    private Long cost;
 
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
-    private Integer grossProfit;
+    private Long grossProfit;
 
     @Schema(description = "推广-用户额度")
-    private Integer grossProfitUserQuota;
+    private Long grossProfitUserQuota;
 
     @Schema(description = "推广-推荐人额度")
-    private Integer grossProfitAncestorQuota;
+    private Long grossProfitAncestorQuota;
 
     @Schema(description = "推广-合赢奖额度(浮动)")
-    private Integer grossProfitBonusQuota;
+    private Long grossProfitBonusQuota;
 
     @Schema(description = "推广-平台分成额度(浮动)")
-    private Integer grossProfitPlatformQuota;
+    private Long grossProfitPlatformQuota;
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
 

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.partitionbrothers.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;
@@ -22,13 +21,13 @@ public class PartitionBrothersPageReqVO extends PageParam {
     private String partNo;
 
     @Schema(description = "业绩", example = "24491")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "是否碰撞 0为未碰撞 1为已碰撞")
     private Integer hasHit;
 
     @Schema(description = "碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;

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

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.partitionbrothers.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.*;
 
@@ -27,7 +24,7 @@ public class PartitionBrothersRespVO {
 
     @Schema(description = "业绩", example = "24491")
     @ExcelProperty("业绩")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "是否碰撞 0为未碰撞 1为已碰撞", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否碰撞 0为未碰撞 1为已碰撞")
@@ -35,7 +32,7 @@ public class PartitionBrothersRespVO {
 
     @Schema(description = "碰撞后额度")
     @ExcelProperty("碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     @ExcelProperty("是否是大区 0为小区 1为大区")

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

@@ -2,7 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.partitionbrothers.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
 import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 兄弟分区新增/修改 Request VO")
@@ -22,14 +21,14 @@ public class PartitionBrothersSaveReqVO {
     private String partNo;
 
     @Schema(description = "业绩", example = "24491")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "是否碰撞 0为未碰撞 1为已碰撞", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "是否碰撞 0为未碰撞 1为已碰撞不能为空")
     private Integer hasHit;
 
     @Schema(description = "碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.partitioncrash.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;
@@ -22,13 +21,13 @@ public class PartitionCrashPageReqVO extends PageParam {
     private String partNo;
 
     @Schema(description = "兄弟分区额度", example = "12349")
-    private Integer brotherPrice;
+    private Long brotherPrice;
 
     @Schema(description = "子分区额度", example = "30462")
-    private Integer sonPrice;
+    private Long sonPrice;
 
     @Schema(description = "碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
     @Schema(description = "用户名称", example = "王五")
     private String userName;
     @Schema(description = "创建时间")

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

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.partitioncrash.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.*;
 
@@ -27,15 +24,15 @@ public class PartitionCrashRespVO {
 
     @Schema(description = "兄弟分区额度", example = "12349")
     @ExcelProperty("兄弟分区额度")
-    private Integer brotherPrice;
+    private Long brotherPrice;
 
     @Schema(description = "子分区额度", example = "30462")
     @ExcelProperty("子分区额度")
-    private Integer sonPrice;
+    private Long sonPrice;
 
     @Schema(description = "碰撞后额度")
     @ExcelProperty("碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

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

@@ -2,8 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.partitioncrash.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
-import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 分区碰撞新增/修改 Request VO")
 @Data
@@ -22,14 +20,14 @@ public class PartitionCrashSaveReqVO {
     private String partNo;
 
     @Schema(description = "兄弟分区额度", example = "12349")
-    private Integer brotherPrice;
+    private Long brotherPrice;
 
     @Schema(description = "子分区额度", example = "30462")
-    private Integer sonPrice;
+    private Long sonPrice;
     @Schema(description = "用户名称", example = "王五")
     private String userName;
     @Schema(description = "碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "用户昵称", example = "赵六")
     private String nickName;

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.partitionson.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;
@@ -22,13 +21,13 @@ public class PartitionSonPageReqVO extends PageParam {
     private String partNo;
 
     @Schema(description = "业绩", example = "5813")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "是否碰撞 0为未碰撞 1为已碰撞")
     private Integer hasHit;
 
     @Schema(description = "碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;

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

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.partitionson.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.*;
 
@@ -27,7 +24,7 @@ public class PartitionSonRespVO {
 
     @Schema(description = "业绩", example = "5813")
     @ExcelProperty("业绩")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "是否碰撞 0为未碰撞 1为已碰撞", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("是否碰撞 0为未碰撞 1为已碰撞")
@@ -35,7 +32,7 @@ public class PartitionSonRespVO {
 
     @Schema(description = "碰撞后额度")
     @ExcelProperty("碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     @ExcelProperty("是否是大区 0为小区 1为大区")

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

@@ -2,7 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.partitionson.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
-import java.util.*;
 import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 后代分区新增/修改 Request VO")
@@ -22,14 +21,14 @@ public class PartitionSonSaveReqVO {
     private String partNo;
 
     @Schema(description = "业绩", example = "5813")
-    private Integer price;
+    private Long price;
 
     @Schema(description = "是否碰撞 0为未碰撞 1为已碰撞", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "是否碰撞 0为未碰撞 1为已碰撞不能为空")
     private Integer hasHit;
 
     @Schema(description = "碰撞后额度")
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofit.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;
@@ -16,13 +15,13 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 public class PtProfitPageReqVO extends PageParam {
 
     @Schema(description = "平台服务费(毛利下的百分比收益)")
-    private Integer ptAdd;
+    private Long ptAdd;
 
     @Schema(description = "平台收益(0.3888 之外的收益)")
-    private Integer ptGrossAdd;
+    private Long ptGrossAdd;
 
     @Schema(description = "平台总收益")
-    private Integer ptTotalAdd;
+    private Long ptTotalAdd;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

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

@@ -2,9 +2,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.ptprofit.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.*;
 
@@ -19,15 +16,15 @@ public class PtProfitRespVO {
 
     @Schema(description = "平台服务费(毛利下的百分比收益)")
     @ExcelProperty("平台服务费(毛利下的百分比收益)")
-    private Integer ptAdd;
+    private Long ptAdd;
 
     @Schema(description = "平台收益(0.3888 之外的收益)")
     @ExcelProperty("平台收益(0.3888 之外的收益)")
-    private Integer ptGrossAdd;
+    private Long ptGrossAdd;
 
     @Schema(description = "平台总收益")
     @ExcelProperty("平台总收益")
-    private Integer ptTotalAdd;
+    private Long ptTotalAdd;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

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

@@ -3,8 +3,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import java.util.*;
-import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 平台利润新增/修改 Request VO")
 @Data
@@ -17,12 +15,12 @@ public class PtProfitSaveReqVO {
     private Long id;
 
     @Schema(description = "平台服务费(毛利下的百分比收益)")
-    private Integer ptAdd;
+    private Long ptAdd;
 
     @Schema(description = "平台收益(0.3888 之外的收益)")
-    private Integer ptGrossAdd;
+    private Long ptGrossAdd;
 
     @Schema(description = "平台总收益")
-    private Integer ptTotalAdd;
+    private Long ptTotalAdd;
 
 }

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

@@ -1,7 +1,6 @@
 package cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.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;
@@ -16,10 +15,10 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 public class PtProfitLogPageReqVO extends PageParam {
 
     @Schema(description = "增加金额")
-    private Integer amount;
+    private Long amount;
 
     @Schema(description = "增加后金额")
-    private Integer afterAmount;
+    private Long afterAmount;
 
     @Schema(description = "收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖", example = "2")
     private Integer profitStatus;

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

@@ -17,11 +17,11 @@ public class PtProfitLogRespVO {
 
     @Schema(description = "增加金额")
     @ExcelProperty("增加金额")
-    private Integer amount;
+    private Long amount;
 
     @Schema(description = "增加后金额")
     @ExcelProperty("增加后金额")
-    private Integer afterAmount;
+    private Long afterAmount;
 
     @Schema(description = "收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖", example = "2")
     @ExcelProperty("收益类型 1:平台服务器费 2:平台收益")

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

@@ -3,8 +3,6 @@ package cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
-import java.util.*;
-import javax.validation.constraints.*;
 
 @Schema(description = "管理后台 - 平台利润记录新增/修改 Request VO")
 @Data
@@ -17,10 +15,10 @@ public class PtProfitLogSaveReqVO {
     private Long id;
 
     @Schema(description = "增加金额")
-    private Integer amount;
+    private Long amount;
 
     @Schema(description = "增加后金额")
-    private Integer afterAmount;
+    private Long afterAmount;
 
     @Schema(description = "收益类型 1:平台服务器费 2:平台收益 3推荐人额度 4直推人额度 5合赢奖 6最高可以获得积分", example = "2")
     private Integer profitStatus;

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

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.integral;
 
 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;
 
@@ -34,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;
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ordercalc/OrderCalcDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.ordercalc;
 
 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;
 
@@ -38,34 +35,34 @@ public class OrderCalcDO extends BaseDO {
     /**
      * 售价
      */
-    private Integer price;
+    private Long price;
     /**
      * 成本
      */
-    private Integer cost;
+    private Long cost;
     /**
      * 毛利 = 成本 * 0.38... (推广费用)
      */
-    private Integer grossProfit;
+    private Long grossProfit;
     /**
      * 推广-用户额度
      */
-    private Integer grossProfitUserQuota;
+    private Long grossProfitUserQuota;
     /**
      * 推广-推荐人额度
      */
-    private Integer grossProfitAncestorQuota;
+    private Long grossProfitAncestorQuota;
     /**
      * 推广-合赢奖额度(浮动)
      */
-    private Integer grossProfitBonusQuota;
+    private Long grossProfitBonusQuota;
     /**
      * 推广-平台分成额度(浮动)
      */
-    private Integer grossProfitPlatformQuota;
+    private Long grossProfitPlatformQuota;
     private String percentTemplate;
     private String nickName;
-    private Integer productCount;
+    private Long productCount;
     private Long orderId;
 
     private String name;

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitionbrothers/PartitionBrothersDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.partitionbrothers;
 
 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;
 
@@ -38,7 +35,7 @@ public class PartitionBrothersDO extends BaseDO {
     /**
      * 业绩
      */
-    private Integer price;
+    private Long price;
     /**
      * 是否碰撞 0为未碰撞 1为已碰撞
      */
@@ -46,7 +43,7 @@ public class PartitionBrothersDO extends BaseDO {
     /**
      * 碰撞后额度
      */
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
     /**
      * 是否是大区 0为小区 1为大区
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitioncrash/PartitionCrashDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.partitioncrash;
 
 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;
 
@@ -38,15 +35,15 @@ public class PartitionCrashDO extends BaseDO {
     /**
      * 兄弟分区额度
      */
-    private Integer brotherPrice;
+    private Long brotherPrice;
     /**
      * 子分区额度
      */
-    private Integer sonPrice;
+    private Long sonPrice;
     /**
      * 碰撞后额度
      */
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
     /**
      * 用户名称
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/partitionson/PartitionSonDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.partitionson;
 
 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;
 
@@ -38,7 +35,7 @@ public class PartitionSonDO extends BaseDO {
     /**
      * 业绩
      */
-    private Integer price;
+    private Long price;
     /**
      * 是否碰撞 0为未碰撞 1为已碰撞
      */
@@ -46,7 +43,7 @@ public class PartitionSonDO extends BaseDO {
     /**
      * 碰撞后额度
      */
-    private Integer afterHitQuota;
+    private Long afterHitQuota;
     /**
      * 是否是大区 0为小区 1为大区
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptprofit/PtProfitDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.ptprofit;
 
 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;
 
@@ -30,14 +27,14 @@ public class PtProfitDO extends BaseDO {
     /**
      * 平台服务费(毛利下的百分比收益)
      */
-    private Integer ptAdd;
+    private Long ptAdd;
     /**
      * 平台收益(0.3888 之外的收益)
      */
-    private Integer ptGrossAdd;
+    private Long ptGrossAdd;
     /**
      * 平台总收益
      */
-    private Integer ptTotalAdd;
+    private Long ptTotalAdd;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/ptprofitlog/PtProfitLogDO.java

@@ -1,9 +1,6 @@
 package cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog;
 
 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;
 
@@ -30,11 +27,11 @@ public class PtProfitLogDO extends BaseDO {
     /**
      * 增加金额
      */
-    private Integer amount;
+    private Long amount;
     /**
      * 增加后金额
      */
-    private Integer afterAmount;
+    private Long afterAmount;
     /**
      * 收益类型 1:平台服务器费 2:平台收益 3用户下单返回毛利额度 4直推人额度 5合赢奖
      */

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

@@ -1,6 +1,5 @@
 package cn.newfeifan.mall.module.distri.mq.message.order;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,12 +15,12 @@ public class DistriOrderMessage {
     /**
      * 总价
      */
-    private Integer totalPrice;
+    private Long totalPrice;
 
     /**
      * 单价
      */
-    private Integer price;
+    private Long price;
 
     /**
      * 购买数量
@@ -35,7 +34,7 @@ public class DistriOrderMessage {
     /**
      * 成本价
      */
-    private Integer costPrice;
+    private Long costPrice;
 
 
     /**

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

@@ -176,8 +176,8 @@ public class DuserServiceImpl implements DuserService {
         // 获取昨日贡献值 + 合赢奖
         String yesterday = ptProfitLogService.getYesterdayLog(sonsId);
         String 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();
 
     }
 
@@ -189,12 +189,12 @@ 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)
-                    .highQuota(0)
+                    .highQuota(0L)
                     .userId(userId).build();
             Long integralId = integralService.createIntegral(integralSaveReqVO);
             integralDO = new IntegralDO().setId(integralId);

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

@@ -42,8 +42,6 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.module.distri.dal.mysql.ordercalc.OrderCalcMapper;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.newfeifan.mall.module.distri.constant.DistriConstants.PERCENT;
-import static cn.newfeifan.mall.module.distri.constant.DistriConstants.THREE;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
 
 /**
@@ -219,13 +217,13 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             BigDecimal highQuota = grossProfit.multiply(new BigDecimal("3")).setScale(4, RoundingMode.DOWN);
 
             // 乘以 10000 并转换为整数
-            int grossProfitInt = grossProfit.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
-            int ancestorQuotaInt = ancestorQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
-            int descendantQuotaInt = descendantQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
-            int bonusQuotaInt = bonusQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
-            int highQuotaInt = highQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
-            int grossProfitAfterBonusInt = grossProfitAfterBonus.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
-            int platformQuotaInt = platformQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
+            Long grossProfitInt = (long) grossProfit.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
+            Long ancestorQuotaInt = (long) ancestorQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
+            Long descendantQuotaInt = (long) descendantQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
+            Long bonusQuotaInt = (long) bonusQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
+            Long highQuotaInt = (long) highQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
+            Long grossProfitAfterBonusInt = (long) grossProfitAfterBonus.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
+            Long platformQuotaInt = (long) platformQuota.multiply(new BigDecimal("10000")).setScale(0, RoundingMode.DOWN).intValueExact();
 
 
             // 获取当前下单人关系
@@ -287,7 +285,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             PtProfitLogSaveReqVO highQuotaLog = PtProfitLogSaveReqVO.builder().orderId(k.getOrderId()).profitStatus(CaclEnum.HIGH_QUOTA.getType()).orderNo(k.getNo()).userId(sharePath.getDescendant()).amount(highQuotaInt).afterAmount(integralDO.getHighQuota() + highQuotaInt).percentTemplate(percentTemplate).build();
 
             // 合赢奖记录
-            PtProfitLogSaveReqVO hyjLog = PtProfitLogSaveReqVO.builder().orderId(k.getOrderId()).profitStatus(CaclEnum.TOGETHER_AWARD.getType()).orderNo(k.getNo()).amount(bonusQuotaInt).afterAmount(0).percentTemplate(percentTemplate).build();
+            PtProfitLogSaveReqVO hyjLog = PtProfitLogSaveReqVO.builder().orderId(k.getOrderId()).profitStatus(CaclEnum.TOGETHER_AWARD.getType()).orderNo(k.getNo()).amount(bonusQuotaInt).afterAmount(0L).percentTemplate(percentTemplate).build();
 
 
             ptProfitLogSaveReqVOS.add(ptTotal);
@@ -312,9 +310,9 @@ public class OrderCalcServiceImpl implements OrderCalcService {
 
         PtProfitDO ptProfit = ptProfitService.getPtProfit();
         // 计算总积分
-        int total = ptProfitSaveReqVOS.stream().mapToInt(PtProfitSaveReqVO::getPtTotalAdd).sum();
-        int add = ptProfitSaveReqVOS.stream().mapToInt(PtProfitSaveReqVO::getPtAdd).sum();
-        int grossAdd = ptProfitSaveReqVOS.stream().mapToInt(PtProfitSaveReqVO::getPtGrossAdd).sum();
+        Long total = ptProfitSaveReqVOS.stream().mapToLong(PtProfitSaveReqVO::getPtTotalAdd).sum();
+        Long add = ptProfitSaveReqVOS.stream().mapToLong(PtProfitSaveReqVO::getPtAdd).sum();
+        Long grossAdd = ptProfitSaveReqVOS.stream().mapToLong(PtProfitSaveReqVO::getPtGrossAdd).sum();
         ptProfit.setPtAdd(ptProfit.getPtAdd() + add);
         ptProfit.setPtTotalAdd(ptProfit.getPtTotalAdd() + total);
         ptProfit.setPtGrossAdd(ptProfit.getPtGrossAdd() + grossAdd);
@@ -329,8 +327,8 @@ public class OrderCalcServiceImpl implements OrderCalcService {
 
     private PtProfitDO calcPtProfit(PtProfitDO ptProfitDO, List<PtProfitSaveReqVO> ptProfitSaveReqVOS) {
 
-        int currentPtAdd = 0;
-        int currentPtGrossAdd = 0;
+        Long currentPtAdd = 0L;
+        Long currentPtGrossAdd = 0L;
 
         for (PtProfitSaveReqVO ptProfitSaveReqVO : ptProfitSaveReqVOS) {
             currentPtAdd = currentPtAdd + ptProfitSaveReqVO.getPtAdd();
@@ -344,7 +342,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
         return ptProfitDO;
     }
 
-    private static void addCaclDo(String percentTemplate, List<OrderCalcSaveReqVO> saveList, DistriOrderMessage k, Integer grossProfit, Integer ancestorQuota, Integer descendantQuota, Integer bonusQuota, Integer platformQuota) {
+    private static void addCaclDo(String percentTemplate, List<OrderCalcSaveReqVO> saveList, DistriOrderMessage k, Long grossProfit, Long ancestorQuota, Long descendantQuota, Long bonusQuota, Long platformQuota) {
         OrderCalcSaveReqVO orderCalcSaveReqVO = OrderCalcSaveReqVO.builder()
                 .userId(k.getUserId())
                 .orderNo(k.getNo())
@@ -360,7 +358,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
     }
 
     private void changeUserWallet(List<IntegralSaveReqVO> integralSaveReqVOS, IntegralDO integralDO, IntegralDO integralDOAncestor, IntegralDO pt,
-                                  Integer ancestorQuota, Integer descendantQuota, Integer highQuota, Integer ptA, Integer ptB) {
+                                  Long ancestorQuota, Long descendantQuota, Long highQuota, Long ptA, Long ptB) {
         // 修改用户钱包
         // 增加直推人额度
         integralDO.setHighQuota(integralDO.getHighQuota() + highQuota);

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

@@ -141,7 +141,7 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
         if (duserDOS.isEmpty()) {
             return;
         }
-        List<HashMap<Long, Integer>> afterCrashMap = new ArrayList<>();
+        List<HashMap<Long, Long>> afterCrashMap = new ArrayList<>();
         // 获取当前合赢奖百分比
         OrderPercentageDO orderPercentageDO = orderPercentageService.queryStatus();
 
@@ -198,10 +198,10 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
             if (sonOrderCalcDOS.isEmpty()) {
                 // 插入空数据
                 sonBuilder = addSonEmpty(sonBuilder, k);
-                crashSaveReqVOBuilder.sonPrice(0);
+                crashSaveReqVOBuilder.sonPrice(0L);
             }
             // 合计儿子分支额度
-            Integer sonSumPrice = sonOrderCalcDOS.stream().mapToInt(OrderCalcDO::getGrossProfitBonusQuota).sum();
+            Long sonSumPrice = sonOrderCalcDOS.stream().mapToLong(OrderCalcDO::getGrossProfitBonusQuota).sum();
             sonBuilder.price(sonSumPrice);
 
             // 获取当前用户的兄弟分区
@@ -209,11 +209,11 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
             if (brothersOrderCalcDOS.isEmpty()) {
                 // 插入空数据
                 brotherBuilder = addBrotherEmpty(brotherBuilder, k);
-                crashSaveReqVOBuilder.brotherPrice(0);
+                crashSaveReqVOBuilder.brotherPrice(0L);
             }
 
             // 合并兄弟分支额度
-            Integer brotherSumPrice = brothersOrderCalcDOS.stream().mapToInt(OrderCalcDO::getGrossProfitBonusQuota).sum();
+            Long brotherSumPrice = brothersOrderCalcDOS.stream().mapToLong(OrderCalcDO::getGrossProfitBonusQuota).sum();
             brotherBuilder.price(brotherSumPrice);
 
 
@@ -228,8 +228,8 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
                 }
             }
 
-            int afterCrash = 0;
-            Integer smallQuota = 0;
+            Long afterCrash = 0L;
+            Long smallQuota = 0L;
             // 碰撞计算
             if (sonSumPrice >= brotherSumPrice) {
                 sonBuilder.size(1);
@@ -251,20 +251,20 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
 
             // 积分添加 添加的时候， 需要注意当前用户是否有足够的积分可以获取
             // 碰撞后的额度的
-            Integer highQuota = integralDO.getHighQuota();
-            Integer 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)) {
-                Integer currentQuota = integralDO.getCurrentQuota();
+                Long currentQuota = integralDO.getCurrentQuota();
                 integralDO.setCurrentQuota(currentQuota + multiply.intValue());
                 // 碰撞后的额度添加到日志中 增加日志模块
                 integralService.updateIntegral(BeanUtils.toBean(integralDO, IntegralSaveReqVO.class));
                 ptProfitLogService.addMessage(k.getUserId(), CaclEnum.SMALL_QUOTA_CRASH, currentQuota, integralDO.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO));
             }
             if (compare(parentHighQuota, multiply)) {
-                Integer currentQuota = parentIntegralDo.getCurrentQuota();
+                Long currentQuota = parentIntegralDo.getCurrentQuota();
                 parentIntegralDo.setCurrentQuota(currentQuota + multiply.intValue());
                 // 碰撞后的额度添加到日志中 增加日志模块
                 integralService.updateIntegral(BeanUtils.toBean(parentIntegralDo, IntegralSaveReqVO.class));
@@ -279,13 +279,13 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
             }
 
             // 获取计算后积分, Long为userId, Integer为碰撞后额度
-            HashMap<Long, Integer> map = new HashMap<>();
+            HashMap<Long, Long> map = new HashMap<>();
             // 如果为当前用户为平台,则不需要存入这个地方
             if (!k.getUserId().equals(PT_ID)){
-                map.put(k.getUserId(), multiply.intValue());
+                map.put(k.getUserId(), multiply.longValue());
             }
             if (!parentIntegralDo.getUserId().equals(PT_ID)){
-                map.put(parentIntegralDo.getUserId(), multiply.intValue());
+                map.put(parentIntegralDo.getUserId(), multiply.longValue());
             }
             afterCrashMap.add(map);
 
@@ -309,8 +309,8 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
         // 获取当前平台的额度
         PtProfitDO ptProfit = ptProfitService.getPtProfit();
         // 遍历hashMap
-        for (HashMap<Long, Integer> longIntegerHashMap : afterCrashMap) {
-            for (Map.Entry<Long, Integer> entry : longIntegerHashMap.entrySet()) {
+        for (HashMap<Long, Long> longIntegerHashMap : afterCrashMap) {
+            for (Map.Entry<Long, Long> entry : longIntegerHashMap.entrySet()) {
                 if (ptProfit.getPtGrossAdd() <= 0) {
                     break;
                 }
@@ -334,7 +334,7 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
                 .ptTotalAdd(ptProfit.getPtTotalAdd()).build());
     }
 
-    public Boolean compare(Integer highQuota, BigDecimal afterCrash) {
+    public Boolean compare(Long highQuota, BigDecimal afterCrash) {
         BigDecimal high = new BigDecimal(String.valueOf(highQuota));
         int i = high.compareTo(afterCrash);
         return i >= 0;
@@ -351,8 +351,8 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
         return brotherBuilder.name(duserDO.getName())
                 .nickName(duserDO.getNickName())
                 .size(0)
-                .price(0)
-                .afterHitQuota(0)
+                .price(0L)
+                .afterHitQuota(0L)
                 .hasHit(0);
     }
 
@@ -362,8 +362,8 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
         return sonBuilder.name(duserDO.getName())
                 .nickName(duserDO.getNickName())
                 .size(0)
-                .price(0)
-                .afterHitQuota(0)
+                .price(0L)
+                .afterHitQuota(0L)
                 .hasHit(0);
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogService.java

@@ -64,7 +64,7 @@ public interface PtProfitLogService {
      * @param afterAmount 增加之后的额度
      * @param jsonString  百分比计算模板
      */
-    void addMessage(Long userId, CaclEnum caclEnum, Integer amount, Integer afterAmount, String jsonString);
+    void addMessage(Long userId, CaclEnum caclEnum, Long amount, Long afterAmount, String jsonString);
     void addMessage(Long userId, CaclEnum caclEnum, Integer amount, Integer afterAmount);
 
     /**

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofitlog/PtProfitLogServiceImpl.java

@@ -89,7 +89,7 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
     }
 
     @Override
-    public void addMessage(Long userId, CaclEnum caclEnum, Integer amount, Integer afterAmount, String percentTemplate) {
+    public void addMessage(Long userId, CaclEnum caclEnum, Long amount, Long afterAmount, String percentTemplate) {
         PtProfitLogSaveReqVO ptProfitLog = PtProfitLogSaveReqVO.builder()
                 .afterAmount(afterAmount)
                 .amount(amount)
@@ -131,7 +131,7 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
                 .eqIfPresent(PtProfitLogDO::getProfitStatus, CaclEnum.DIRECT_REFERRAL_QUOTA.getType())
                 .or().eq(PtProfitLogDO::getProfitStatus, CaclEnum.TOGETHER_AWARD.getType())
                 .in(PtProfitLogDO::getUserId, sonsId));
-        int sum = ptProfitLogDOS.stream().mapToInt(PtProfitLogDO::getAmount).sum();
+        Long sum = ptProfitLogDOS.stream().mapToLong(PtProfitLogDO::getAmount).sum();
 
         return sum + "";
     }
@@ -142,7 +142,7 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
                 .eqIfPresent(PtProfitLogDO::getProfitStatus, CaclEnum.DIRECT_REFERRAL_QUOTA.getType())
                 .or().eq(PtProfitLogDO::getProfitStatus, CaclEnum.TOGETHER_AWARD.getType())
                 .in(PtProfitLogDO::getUserId, sonsId));
-        int sum = ptProfitLogDOS.stream().mapToInt(PtProfitLogDO::getAmount).sum();
+        Long sum = ptProfitLogDOS.stream().mapToLong(PtProfitLogDO::getAmount).sum();
 
         return sum + "";
     }