修改计算程序

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

@@ -293,7 +293,7 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
                     // 碰撞后的额度添加到日志中 增加日志模块
                     integralService.updateIntegral(BeanUtils.toBean(integralDO, IntegralSaveReqVO.class));
                     ptProfitLogService.addMessage(k.getUserId(), CaclEnum.SMALL_QUOTA_CRASH, amount,
-                            integralDO.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO), ptReplenish,-amount,highQuota - amount);
+                            integralDO.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO), ptReplenish, -amount, highQuota - amount);
                 }
 
                 //直推人的上级的本次添加积分
@@ -320,7 +320,7 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
                     // 碰撞后的额度添加到日志中 增加日志模块
                     integralService.updateIntegral(BeanUtils.toBean(parentIntegralDo, IntegralSaveReqVO.class));
                     ptProfitLogService.addMessage(parentIntegralDo.getUserId(), CaclEnum.SMALL_QUOTA_CRASH, parentAmount,
-                            parentIntegralDo.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO), parentPtReplenish,-parentAmount,parentHighQuota - parentAmount);
+                            parentIntegralDo.getCurrentQuota(), JsonUtils.toJsonString(orderPercentageDO), parentPtReplenish, -parentAmount, parentHighQuota - parentAmount);
                 }
 
                 if (!ptReplenish.equals(0L)) {
@@ -418,9 +418,9 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
                     ptProfit.setPtTotalAdd(ptProfit.getPtTotalAdd() - amount);
                     // 碰撞后的额度添加到日志中 增加日志模块
                     ptProfitLogService.addMessage(entry.getKey(), CaclEnum.AFTER_CRASH_CALC_PT_TOTAL_QUOTA
-                            , -entry.getValue(), ptProfit.getPtTotalAdd(), JsonUtils.toJsonString(orderPercentageDO), null,null,null);
+                            , -entry.getValue(), ptProfit.getPtTotalAdd(), JsonUtils.toJsonString(orderPercentageDO), null, null, null);
                     ptProfitLogService.addMessage(entry.getKey(), CaclEnum.AFTER_CRASH_CALC_PT_TOTAL_GROSS_QUOTA
-                            , -entry.getValue(), ptProfit.getPtGrossAdd(), JsonUtils.toJsonString(orderPercentageDO), null,null,null);
+                            , -entry.getValue(), ptProfit.getPtGrossAdd(), JsonUtils.toJsonString(orderPercentageDO), null, null, null);
                 }
             }
         }
@@ -456,7 +456,7 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
     private void calcIntegral(Long multiply, Long userId, String jsonString) {
         PtProfitDO ptProfit = ptProfitService.getPtProfit();
         ptProfitLogService.addMessage(userId, CaclEnum.GROSS_PROFIT_BONUS_QUOTA_PERC_EXCEED_MAXIMUM_LIMIT, multiply,
-                ptProfit.getPtTotalAdd(), jsonString, null,null,null);
+                ptProfit.getPtTotalAdd(), jsonString, null, null, null);
     }
 
     private void createPtProfitDailyStatisticsLog(Long sum) {
@@ -472,7 +472,11 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
 
         ptLog = new PtProfitDailyStatisticsLogDO();
         ptLog.setEveryday(now);
-        ptLog.setTotalCollisionAmount(sum);
+        if (!ptLog.getTotalCollisionAmount().equals(0L)) {
+            ptLog.setTotalCollisionAmount(sum + ptLog.getTotalCollisionAmount());
+        } else {
+            ptLog.setTotalCollisionAmount(sum);
+        }
         ptLog.setTotalRemainingAmount(ptProfitDO.getPtGrossAdd());
 
         ptProfitDailyStatisticsLogMapper.insert(ptLog);