修改百分比以String的方式接收

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

@@ -11,22 +11,22 @@ public class OrderPercentageDoubleSaveReqVO {
     private Long id;
 
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
-    private Double grossProfitPerc;
+    private String grossProfitPerc;
 
     @Schema(description = "推广-用户额度 百分比")
-    private Double grossProfitUserQuotaPerc;
+    private String grossProfitUserQuotaPerc;
 
     @Schema(description = "推广-推荐人额度 百分比")
-    private Double grossProfitAncestorQuotaPerc;
+    private String grossProfitAncestorQuotaPerc;
 
     @Schema(description = "推广-合赢奖额度(浮动) 百分比")
-    private Double grossProfitBonusQuotaPerc;
+    private String grossProfitBonusQuotaPerc;
 
     @Schema(description = "推广-平台分成额度(浮动) 百分比")
-    private Double grossProfitPlatformQuotaPerc;
+    private String grossProfitPlatformQuotaPerc;
 
     @Schema(description = "分成百分比")
-    private Double divideIntoPerc;
+    private String divideIntoPerc;
     @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

@@ -16,22 +16,22 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 public class OrderPercentagePageReqVO extends PageParam {
 
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
-    private Integer grossProfitPerc;
+    private String grossProfitPerc;
 
     @Schema(description = "推广-用户额度 百分比")
-    private Integer grossProfitUserQuotaPerc;
+    private String grossProfitUserQuotaPerc;
 
     @Schema(description = "推广-推荐人额度 百分比")
-    private Integer grossProfitAncestorQuotaPerc;
+    private String grossProfitAncestorQuotaPerc;
 
     @Schema(description = "推广-合赢奖额度(浮动) 百分比")
-    private Integer grossProfitBonusQuotaPerc;
+    private String grossProfitBonusQuotaPerc;
 
     @Schema(description = "推广-平台分成额度(浮动) 百分比")
-    private Integer grossProfitPlatformQuotaPerc;
+    private String grossProfitPlatformQuotaPerc;
 
     @Schema(description = "分成百分比")
-    private Integer divideIntoPerc;
+    private String divideIntoPerc;
 
     @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/orderpercentage/vo/OrderPercentageRespVO.java

@@ -19,27 +19,27 @@ public class OrderPercentageRespVO {
 
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
     @ExcelProperty("毛利 = 成本 * 0.38... (推广费用)")
-    private Integer grossProfitPerc;
+    private String grossProfitPerc;
 
     @Schema(description = "推广-用户额度 百分比")
     @ExcelProperty("推广-用户额度 百分比")
-    private Integer grossProfitUserQuotaPerc;
+    private String grossProfitUserQuotaPerc;
 
     @Schema(description = "推广-推荐人额度 百分比")
     @ExcelProperty("推广-推荐人额度 百分比")
-    private Integer grossProfitAncestorQuotaPerc;
+    private String grossProfitAncestorQuotaPerc;
 
     @Schema(description = "推广-合赢奖额度(浮动) 百分比")
     @ExcelProperty("推广-合赢奖额度(浮动) 百分比")
-    private Integer grossProfitBonusQuotaPerc;
+    private String grossProfitBonusQuotaPerc;
 
     @Schema(description = "推广-平台分成额度(浮动) 百分比")
     @ExcelProperty("推广-平台分成额度(浮动) 百分比")
-    private Integer grossProfitPlatformQuotaPerc;
+    private String grossProfitPlatformQuotaPerc;
 
     @Schema(description = "分成百分比")
     @ExcelProperty("分成百分比")
-    private Integer divideIntoPerc;
+    private String divideIntoPerc;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

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

@@ -13,22 +13,22 @@ public class OrderPercentageSaveReqVO {
     private Long id;
 
     @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
-    private Integer grossProfitPerc;
+    private String grossProfitPerc;
 
     @Schema(description = "推广-用户额度 百分比")
-    private Integer grossProfitUserQuotaPerc;
+    private String grossProfitUserQuotaPerc;
 
     @Schema(description = "推广-推荐人额度 百分比")
-    private Integer grossProfitAncestorQuotaPerc;
+    private String grossProfitAncestorQuotaPerc;
 
     @Schema(description = "推广-合赢奖额度(浮动) 百分比")
-    private Integer grossProfitBonusQuotaPerc;
+    private String grossProfitBonusQuotaPerc;
 
     @Schema(description = "推广-平台分成额度(浮动) 百分比")
-    private Integer grossProfitPlatformQuotaPerc;
+    private String grossProfitPlatformQuotaPerc;
 
     @Schema(description = "分成百分比")
-    private Integer divideIntoPerc;
+    private String divideIntoPerc;
     @Schema(description = "是否启用 0关闭 1启动", example = "2")
     private Integer status;
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/dataobject/orderpercentage/OrderPercentageDO.java

@@ -30,27 +30,27 @@ public class OrderPercentageDO extends BaseDO {
     /**
      * 毛利 = 成本 * 0.38... (推广费用)
      */
-    private Integer grossProfitPerc;
+    private String grossProfitPerc;
     /**
      * 推广-用户额度 百分比
      */
-    private Integer grossProfitUserQuotaPerc;
+    private String grossProfitUserQuotaPerc;
     /**
      * 推广-推荐人额度 百分比
      */
-    private Integer grossProfitAncestorQuotaPerc;
+    private String grossProfitAncestorQuotaPerc;
     /**
      * 推广-合赢奖额度(浮动) 百分比
      */
-    private Integer grossProfitBonusQuotaPerc;
+    private String grossProfitBonusQuotaPerc;
     /**
      * 推广-平台分成额度(浮动) 百分比
      */
-    private Integer grossProfitPlatformQuotaPerc;
+    private String grossProfitPlatformQuotaPerc;
     /**
      * 分成百分比
      */
-    private Integer divideIntoPerc;
+    private String divideIntoPerc;
 
     private Integer status;
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/orderpercentage/OrderPercentageMapper.java

@@ -19,14 +19,14 @@ public interface OrderPercentageMapper extends BaseMapperX<OrderPercentageDO> {
 
     default PageResult<OrderPercentageDO> selectPage(OrderPercentagePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<OrderPercentageDO>()
+                .betweenIfPresent(OrderPercentageDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitPerc, reqVO.getGrossProfitPerc())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitUserQuotaPerc, reqVO.getGrossProfitUserQuotaPerc())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitAncestorQuotaPerc, reqVO.getGrossProfitAncestorQuotaPerc())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitBonusQuotaPerc, reqVO.getGrossProfitBonusQuotaPerc())
                 .eqIfPresent(OrderPercentageDO::getGrossProfitPlatformQuotaPerc, reqVO.getGrossProfitPlatformQuotaPerc())
-                .eqIfPresent(OrderPercentageDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(OrderPercentageDO::getDivideIntoPerc, reqVO.getDivideIntoPerc())
-                .betweenIfPresent(OrderPercentageDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(OrderPercentageDO::getStatus, reqVO.getStatus())
                 .orderByDesc(OrderPercentageDO::getId));
     }
 

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

@@ -148,12 +148,8 @@ public class OrderCalcServiceImpl implements OrderCalcService {
 
         PtProfitDO ptProfitDO = ptProfitService.getPtProfit();
         tradeOrderDO.forEach(k -> {
-            // 获取当前下单人关系
-            SharePathDO sharePath = getSharePath(k.getUserId());
-            // 如果sharePath为空, 则说明没有直推人关系
-            IntegralDO integralDOAncestor = integralService.selectByUser(sharePath.getAncestor());
-            IntegralDO integralDO = integralService.selectByUser(sharePath.getDescendant());
 
+            // 计算
             // 计算利润: (价格 - 成本价格) * 产品数量
             Integer profit = (k.getPrice() - k.getCostPrice()) * k.getProductCount();
             // 计算毛利: 利润 * 0.38
@@ -171,6 +167,15 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             Integer highQuota = grossProfit * THREE;
 
 
+
+
+
+            // 获取当前下单人关系
+            SharePathDO sharePath = getSharePath(k.getUserId());
+            // 如果sharePath为空, 则说明没有直推人关系
+            IntegralDO integralDOAncestor = integralService.selectByUser(sharePath.getAncestor());
+            IntegralDO integralDO = integralService.selectByUser(sharePath.getDescendant());
+
             // ========== 汇总计算 =================
             addCaclDo(percentTemplate, saveList, k, grossProfit, ancestorQuota, descendantQuota, bonusQuota, platformQuota);
             // ========== 修改用户钱包 =================