Merge branch 'dev/2024/0528/update-admin-Y' of feifan/mall-backend-admin into master

更新合赢奖和直推奖的计算

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

@@ -377,7 +377,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                     .build();
 
 
-            // 用户自得记录
+            // 用户自得记录+户冻结积分转化成可用记录
             PtProfitLogSaveReqVO ztrLog = PtProfitLogSaveReqVO.builder()
                     .orderId(k.getOrderId())
                     .profitStatus(CaclEnum.DIRECT_REFERRAL_QUOTA.getType())
@@ -385,21 +385,9 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                     .userId(sharePath.getDescendant())
                     .amount(descendantQuotaInt)
                     .afterAmount(integralDO.getCurrentQuota() + descendantQuotaInt)
-                    .percentTemplate(percentTemplate)
-                    .build();
-            // 用户冻结积分转化成可用记录
-            PtProfitLogSaveReqVO freezeLog = PtProfitLogSaveReqVO.builder()
-                    .orderId(k.getOrderId())
-                    .profitStatus(CaclEnum.FREEZE_CHANGE_INTEGRAL.getType())
-                    .orderNo(k.getNo())
-                    .userId(sharePath.getDescendant())
-                    .amount(descendantQuotaInt)
-                    .afterAmount(integralDO.getCurrentQuota() + descendantQuotaInt)
                     .freezeAmount(descendantQuotaInt)
                     .afterFreezeAmount(integralDO.getFreezeQuota())
                     .percentTemplate(percentTemplate)
-                    .amount(descendantQuotaInt)
-                    .afterAmount(integralDO.getCurrentQuota() + descendantQuotaInt)
                     .build();
 
             PtProfitLogSaveReqVO highQuotaLog = PtProfitLogSaveReqVO.builder()
@@ -408,7 +396,7 @@ public class OrderCalcServiceImpl implements OrderCalcService {
                     .orderNo(k.getNo())
                     .userId(sharePath.getDescendant())
                     .amount(highQuotaInt)
-                    .afterAmount(integralDO.getHighQuota() + highQuotaInt)
+                    .afterAmount(integralDO.getHighQuota())
                     .percentTemplate(percentTemplate)
                     .build();
 
@@ -427,7 +415,6 @@ public class OrderCalcServiceImpl implements OrderCalcService {
             ptProfitLogSaveReqVOS.add(ptAddLog);
             ptProfitLogSaveReqVOS.add(tjrLog);
             ptProfitLogSaveReqVOS.add(ztrLog);
-            ptProfitLogSaveReqVOS.add(freezeLog);
             ptProfitLogSaveReqVOS.add(hyjLog);
             ptProfitLogSaveReqVOS.add(highQuotaLog);
 
@@ -435,9 +422,6 @@ public class OrderCalcServiceImpl implements OrderCalcService {
         });
 
         // 信息整合
-        // 计算平台收益
-//        ptProfitDO = calcPtProfit(ptProfitDO, ptProfitSaveReqVOS);
-
         // 将信息存储到数据库中
         orderCalcMapper.insertBatch(BeanUtils.toBean(saveList, OrderCalcDO.class));