Merge branch 'dev/2024/0604/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/partitioncrash/PartitionCrashServiceImpl.java

@@ -464,7 +464,9 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
 
         //确保每天只有一条记录
         PtProfitDailyStatisticsLogDO ptLog = ptProfitDailyStatisticsLogMapper.selectByEveryday(now);
+        Long totalCollisionAmount = 0L;
         if (ptLog != null) {
+            totalCollisionAmount = ptLog.getTotalCollisionAmount();
             ptProfitDailyStatisticsLogMapper.deleteById(ptLog.getId());
         }
         //获取平台总收益
@@ -472,8 +474,8 @@ public class PartitionCrashServiceImpl implements PartitionCrashService {
 
         ptLog = new PtProfitDailyStatisticsLogDO();
         ptLog.setEveryday(now);
-        if (!ptLog.getTotalCollisionAmount().equals(0L)) {
-            ptLog.setTotalCollisionAmount(sum + ptLog.getTotalCollisionAmount());
+        if (totalCollisionAmount.equals(0L)) {
+            ptLog.setTotalCollisionAmount(sum + totalCollisionAmount);
         } else {
             ptLog.setTotalCollisionAmount(sum);
         }