修改营销模块, 更新创建积分百分比设置

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/constant/DistriConstants.java

@@ -0,0 +1,10 @@
+package cn.newfeifan.mall.module.distri.constant;
+
+import cn.newfeifan.mall.framework.common.exception.ErrorCode;
+
+public class DistriConstants {
+    // ========== 分销信息商户信息 1-002-029-000 ==========
+    public static final Integer PERCENT = 10000;
+    public static final Double ONE_HUNDRED = 1d;
+
+}

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/ErrorCodeConstants.java

@@ -4,7 +4,7 @@ import cn.newfeifan.mall.framework.common.exception.ErrorCode;
 
 public interface ErrorCodeConstants {
     // ========== 分销信息商户信息 1-002-029-000 ==========
-    ErrorCode SHARE_PATH_NOT_EXISTS = new ErrorCode(1_002_030_000 , "分销路径不存在");
+    ErrorCode SHARE_PATH_NOT_EXISTS = new ErrorCode(1_002_030_000, "分销路径不存在");
     ErrorCode SOCIAL_STATUS_NOT_EXISTS = new ErrorCode(1_002_030_001, "身价不存在");
     ErrorCode SOURCE_NOT_EXISTS = new ErrorCode(1_002_030_002, "分销来源不存在");
     ErrorCode INTEGRAL_NOT_EXISTS = new ErrorCode(1_002_030_002, "积分表不存在");
@@ -18,5 +18,6 @@ public interface ErrorCodeConstants {
     ErrorCode PARTITION_CRASH_NOT_EXISTS = new ErrorCode(1_002_030_003, "碰撞分区不存在");
     ErrorCode PT_PROFIT_NOT_EXISTS = new ErrorCode(1_002_030_003, "平台利润不存在");
     ErrorCode PT_PROFIT_LOG_NOT_EXISTS = new ErrorCode(1_002_030_003, "平台利润日志表不存在");
+    ErrorCode PERCENT_LARGE_ONE_HUNDRED = new ErrorCode(1_002_030_003, "百分比总和超过100");
 
 }

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

@@ -41,14 +41,14 @@ public class OrderPercentageController {
     @PostMapping("/create")
     @Operation(summary = "创建积分相关计算浮动百分比设置")
     @PreAuthorize("@ss.hasPermission('distri:order-percentage:create')")
-    public CommonResult<Long> createOrderPercentage(@Valid @RequestBody OrderPercentageSaveReqVO createReqVO) {
+    public CommonResult<Long> createOrderPercentage(@Valid @RequestBody OrderPercentageDoubleSaveReqVO createReqVO) {
         return success(orderPercentageService.createOrderPercentage(createReqVO));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新积分相关计算浮动百分比设置")
     @PreAuthorize("@ss.hasPermission('distri:order-percentage:update')")
-    public CommonResult<Boolean> updateOrderPercentage(@Valid @RequestBody OrderPercentageSaveReqVO updateReqVO) {
+    public CommonResult<Boolean> updateOrderPercentage(@Valid @RequestBody OrderPercentageDoubleSaveReqVO updateReqVO) {
         orderPercentageService.updateOrderPercentage(updateReqVO);
         return success(true);
     }

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

@@ -0,0 +1,37 @@
+package cn.newfeifan.mall.module.distri.controller.admin.orderpercentage.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 积分相关计算浮动百分比设置新增/修改 Request VO")
+@Data
+public class OrderPercentageDoubleSaveReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2203")
+    private Long id;
+
+    @Schema(description = "毛利 = 成本 * 0.38... (推广费用)")
+    private Double grossProfitPerc;
+
+    @Schema(description = "推广-用户额度 百分比")
+    private Double grossProfitUserQuotaPerc;
+
+    @Schema(description = "推广-推荐人额度 百分比")
+    private Double grossProfitAncestorQuotaPerc;
+
+    @Schema(description = "推广-合赢奖额度(浮动) 百分比")
+    private Double grossProfitBonusQuotaPerc;
+
+    @Schema(description = "推广-平台分成额度(浮动) 百分比")
+    private Double grossProfitPlatformQuotaPerc;
+
+    @Schema(description = "分成百分比")
+    private Double 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/OrderPercentageSaveReqVO.java

@@ -31,4 +31,9 @@ public class OrderPercentageSaveReqVO {
     private Integer 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/ptprofit/vo/PtProfitSaveReqVO.java

@@ -2,20 +2,24 @@ 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
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class PtProfitSaveReqVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "24754")
     private Long id;
 
-    @Schema(description = "平台服务费(毛利下的百分比收益)")
+    @Schema(description = "平台收益(0.3888 之外的收益)")
     private Integer ptAdd;
 
-    @Schema(description = "平台收益(0.3888 之外的收益)")
+    @Schema(description = "平台服务费(毛利下的百分比收益)")
     private Integer ptGrossAdd;
 
     @Schema(description = "平台总收益")

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

@@ -2,11 +2,15 @@ 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
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class PtProfitLogSaveReqVO {
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "12046")

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

@@ -1,8 +1,14 @@
 package cn.newfeifan.mall.module.distri.service.ordercalc;
 
 import cn.newfeifan.mall.framework.common.mq.message.order.DistriOrderMessage;
+import cn.newfeifan.mall.framework.common.util.json.JsonUtils;
+import cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo.PtProfitSaveReqVO;
+import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo.PtProfitLogSaveReqVO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.orderpercentage.OrderPercentageDO;
+import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofit.PtProfitDO;
 import cn.newfeifan.mall.module.distri.service.orderpercentage.OrderPercentageService;
+import cn.newfeifan.mall.module.distri.service.ptprofit.PtProfitService;
+import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,6 +28,7 @@ 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.enums.ErrorCodeConstants.*;
 
 /**
@@ -36,6 +43,13 @@ public class OrderCalcServiceImpl implements OrderCalcService {
     @Resource
     private OrderCalcMapper orderCalcMapper;
 
+    @Resource
+    private PtProfitService ptProfitService;
+
+    @Resource
+    private PtProfitLogService ptProfitLogService;
+
+
     @Override
     public Long createOrderCalc(OrderCalcSaveReqVO createReqVO) {
         // 插入
@@ -85,8 +99,18 @@ public class OrderCalcServiceImpl implements OrderCalcService {
     public void calc(List<DistriOrderMessage> tradeOrderDO) {
 
         OrderPercentageDO orderPercentageDO = orderPercentageService.queryStatus();
+        // 当前计算百分比模板
+        String percentTemplate = JsonUtils.toJsonString(orderPercentageDO);
+
 
+        // 每个订单收益
         List<OrderCalcSaveReqVO> saveList = new ArrayList<>();
+        // 平台收益
+        List<PtProfitSaveReqVO> ptProfitSaveReqVOS = new ArrayList<>();
+        // 平台收益日志
+        List<PtProfitLogSaveReqVO> ptProfitLogSaveReqVOS = new ArrayList<>();
+
+        PtProfitDO ptProfitDO = ptProfitService.getPtProfit();
 
         tradeOrderDO.forEach(k -> {
 
@@ -115,17 +139,52 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                     .grossProfitAncestorQuota(ancestorQuota)
                     .grossProfitBonusQuota(bonusQuota)
                     .grossProfitPlatformQuota(platformQuota)
+                    .percentTemplate(percentTemplate)
                     .build();
             saveList.add(orderCalcSaveReqVO);
 
             // 每个订单计算的过程
-
             // 增加平台收益
+            // 平台服务费
+            Integer ptGrossAdd = ptProfitDO.getPtGrossAdd() + platformQuota;
+            // 平台收益
+            Integer ptAdd = ptProfitDO.getPtAdd() + grossProfit * (10000 - orderPercentageDO.getGrossProfitBonusQuotaPerc());
+            // 平台总收益
+            Integer ptTotal = ptProfitDO.getPtTotalAdd() + ptGrossAdd + ptAdd;
+
+            PtProfitSaveReqVO ptProfitSaveReqVO = PtProfitSaveReqVO.builder()
+                    .ptAdd(ptAdd)
+                    .ptGrossAdd(ptGrossAdd)
+                    .ptTotalAdd(ptTotal).build();
+            ptProfitSaveReqVOS.add(ptProfitSaveReqVO);
+
+            // 平台记录
+            PtProfitLogSaveReqVO ptGrossAddLog = PtProfitLogSaveReqVO.builder()
+                    .orderId(k.getOrderId())
+                    .profitStatus(1)
+                    .amount(platformQuota)
+                    .afterAmount(ptProfitSaveReqVO.getPtGrossAdd())
+                    .percentTemplate(percentTemplate).build();
+
+            PtProfitLogSaveReqVO ptAddLog = PtProfitLogSaveReqVO.builder()
+                    .orderId(k.getOrderId())
+                    .profitStatus(2)
+                    .amount(grossProfit * (PERCENT - orderPercentageDO.getGrossProfitBonusQuotaPerc()))
+                    .afterAmount(ptProfitSaveReqVO.getPtAdd())
+                    .percentTemplate(percentTemplate).build();
+            ptProfitLogSaveReqVOS.add(ptGrossAddLog);
+            ptProfitLogSaveReqVOS.add(ptAddLog);
 
 
+        });
 
+        // 将信息存储到数据库中
+        orderCalcMapper.insertBatch(BeanUtils.toBean(saveList, OrderCalcDO.class));
+        ptProfitService.saveBatch(ptProfitSaveReqVOS);
+        ptProfitLogService.saveBatch(ptProfitLogSaveReqVOS);
 
-        });
+
+        // todo 计算当天用户的碰撞
 
 
     }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/orderpercentage/OrderPercentageService.java

@@ -20,14 +20,14 @@ public interface OrderPercentageService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createOrderPercentage(@Valid OrderPercentageSaveReqVO createReqVO);
+    Long createOrderPercentage(@Valid OrderPercentageDoubleSaveReqVO createReqVO);
 
     /**
      * 更新积分相关计算浮动百分比设置
      *
      * @param updateReqVO 更新信息
      */
-    void updateOrderPercentage(@Valid OrderPercentageSaveReqVO updateReqVO);
+    void updateOrderPercentage(@Valid OrderPercentageDoubleSaveReqVO updateReqVO);
 
     /**
      * 删除积分相关计算浮动百分比设置

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/orderpercentage/OrderPercentageServiceImpl.java

@@ -20,6 +20,8 @@ import cn.newfeifan.mall.framework.common.util.object.BeanUtils;
 import cn.newfeifan.mall.module.distri.dal.mysql.orderpercentage.OrderPercentageMapper;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.newfeifan.mall.module.distri.constant.DistriConstants.ONE_HUNDRED;
+import static cn.newfeifan.mall.module.distri.constant.DistriConstants.PERCENT;
 import static cn.newfeifan.mall.module.distri.enums.ErrorCodeConstants.*;
 
 /**
@@ -35,16 +37,34 @@ public class OrderPercentageServiceImpl implements OrderPercentageService {
     private OrderPercentageMapper orderPercentageMapper;
 
     @Override
-    public Long createOrderPercentage(OrderPercentageSaveReqVO createReqVO) {
+    public Long createOrderPercentage(OrderPercentageDoubleSaveReqVO createReqVO) {
+        OrderPercentageSaveReqVO orderPercentageSaveReqVO = new OrderPercentageSaveReqVO();
+        orderPercentageSaveReqVO.setDivideIntoPerc((int) (createReqVO.getDivideIntoPerc() * PERCENT));
+        orderPercentageSaveReqVO.setGrossProfitPerc((int) (createReqVO.getGrossProfitPerc() * PERCENT));
+        orderPercentageSaveReqVO.setGrossProfitAncestorQuotaPerc((int) (createReqVO.getGrossProfitAncestorQuotaPerc() * PERCENT));
+        orderPercentageSaveReqVO.setGrossProfitBonusQuotaPerc((int) (createReqVO.getGrossProfitBonusQuotaPerc() * PERCENT));
+        orderPercentageSaveReqVO.setGrossProfitPlatformQuotaPerc((int) (createReqVO.getGrossProfitPlatformQuotaPerc() * PERCENT));
+        orderPercentageSaveReqVO.setGrossProfitUserQuotaPerc((int) (createReqVO.getGrossProfitUserQuotaPerc() * PERCENT));
+        if (checkPercent(createReqVO)){
+            throw  exception(PERCENT_LARGE_ONE_HUNDRED);
+        }
         // 插入
-        OrderPercentageDO orderPercentage = BeanUtils.toBean(createReqVO, OrderPercentageDO.class);
+        OrderPercentageDO orderPercentage = BeanUtils.toBean(orderPercentageSaveReqVO, OrderPercentageDO.class);
         orderPercentageMapper.insert(orderPercentage);
         // 返回
         return orderPercentage.getId();
     }
 
+    public boolean checkPercent(OrderPercentageDoubleSaveReqVO createReqVO){
+        // 判断是否等于1
+        Double total =  createReqVO.getGrossProfitUserQuotaPerc()+createReqVO.getGrossProfitAncestorQuotaPerc()+createReqVO.getGrossProfitPlatformQuotaPerc()
+                +createReqVO.getGrossProfitBonusQuotaPerc();
+        return total > ONE_HUNDRED;
+    }
+
+
     @Override
-    public void updateOrderPercentage(OrderPercentageSaveReqVO updateReqVO) {
+    public void updateOrderPercentage(OrderPercentageDoubleSaveReqVO updateReqVO) {
         // 校验存在
         validateOrderPercentageExists(updateReqVO.getId());
         // 更新

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/orderpercentage/handle/OrderPercentCheckHandler.java

@@ -0,0 +1,14 @@
+package cn.newfeifan.mall.module.distri.service.orderpercentage.handle;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * 订单百分比校验
+ *
+ * @author HUIHUI
+ */
+@Component
+public class OrderPercentCheckHandler  implements OrderPercentHandler{
+
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/orderpercentage/handle/OrderPercentHandler.java

@@ -0,0 +1,24 @@
+package cn.newfeifan.mall.module.distri.service.orderpercentage.handle;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.newfeifan.mall.module.promotion.api.bargain.BargainActivityApi;
+import cn.newfeifan.mall.module.promotion.api.bargain.BargainRecordApi;
+import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
+import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import cn.newfeifan.mall.module.trade.enums.order.TradeOrderTypeEnum;
+import cn.newfeifan.mall.module.trade.service.order.handler.TradeOrderHandler;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 订单百分比
+ *
+ * @author HUIHUI
+ */
+public interface OrderPercentHandler {
+
+
+}

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofit/PtProfitService.java

@@ -52,4 +52,12 @@ public interface PtProfitService {
      */
     PageResult<PtProfitDO> getPtProfitPage(PtProfitPageReqVO pageReqVO);
 
+    /**
+     * 获取当前平台信息
+     */
+    PtProfitDO getPtProfit();
+
+
+    void saveBatch(List<PtProfitSaveReqVO> ptProfitSaveReqVOS);
+
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/ptprofit/PtProfitServiceImpl.java

@@ -1,11 +1,15 @@
 package cn.newfeifan.mall.module.distri.service.ptprofit;
 
+import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+
 import cn.newfeifan.mall.module.distri.controller.admin.ptprofit.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofit.PtProfitDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
@@ -71,4 +75,17 @@ public class PtProfitServiceImpl implements PtProfitService {
         return ptProfitMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PtProfitDO getPtProfit() {
+        return ptProfitMapper.selectList(new LambdaQueryWrapperX<PtProfitDO>()).get(0);
+    }
+
+    @Override
+    public void saveBatch(List<PtProfitSaveReqVO> ptProfitSaveReqVOS) {
+
+        List<PtProfitDO> ptProfit = BeanUtils.toBean(ptProfitSaveReqVOS, PtProfitDO.class);
+        ptProfitMapper.insertBatch(ptProfit);
+
+    }
+
 }

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

@@ -52,4 +52,7 @@ public interface PtProfitLogService {
      */
     PageResult<PtProfitLogDO> getPtProfitLogPage(PtProfitLogPageReqVO pageReqVO);
 
+    void saveBatch(List<PtProfitLogSaveReqVO> ptProfitLogSaveReqVOS);
+
+
 }

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

@@ -1,11 +1,14 @@
 package cn.newfeifan.mall.module.distri.service.ptprofitlog;
 
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+
 import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo.*;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ptprofitlog.PtProfitLogDO;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
@@ -71,4 +74,10 @@ public class PtProfitLogServiceImpl implements PtProfitLogService {
         return ptProfitLogMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public void saveBatch(List<PtProfitLogSaveReqVO> ptProfitLogSaveReqVOS) {
+        List<PtProfitLogDO> ptProfitLog = BeanUtils.toBean(ptProfitLogSaveReqVOS, PtProfitLogDO.class);
+        ptProfitLogMapper.insertBatch(ptProfitLog);
+    }
+
 }