Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into test

performance-web/src/main/java/com/clx/performance/service/impl/IntegralRecordServiceImpl.java

@@ -123,7 +123,8 @@ public class IntegralRecordServiceImpl implements IntegralRecordService {
         IntegralStatistics statistics = integralStatisticsDao.selectByTruckNoAndStatisticsDate(truckNo, statisticsDate).orNull();
         if (statistics == null) {return;}
 
-        int sum = integralRecordDao.sumByStatisticsIdAndTypes(statistics.getId(), Arrays.asList(IntegralRecordEnum.Type.ORDER_CHILD_PLATFORM_COMPENSATION.getValue()));
+        Integer sum = integralRecordDao.sumByStatisticsIdAndTypes(statistics.getId(), Arrays.asList(IntegralRecordEnum.Type.ORDER_CHILD_PLATFORM_COMPENSATION.getValue()));
+        if (sum == null) {sum = 0;}
         if (sum > ruleInfo.getPlatformCompensationRule().getIntegralCancelLimit()){
             log.info("平台补偿超上限，本次无效， truckNo:{}, type:{}, integral:{}, remark:{}", truckNo, type, integral, remark);
             return;

performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java

@@ -609,6 +609,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                                                     childSum
                                             )
                             );
+                            update.setResidueTransportWeight(orderGoods.getResidueTransportWeight().add(childSum));
                             truckDemandMap.put(orderGoods.getTruckDemand(),
                                     truckDemandMap.get(orderGoods.getTruckDemand())
                                             .add(childSum));
@@ -632,6 +633,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                                                     childSum
                                             )
                             );
+                            update.setResidueTransportWeight(orderGoods.getResidueTransportWeight().add(childSum));
+
                             vehicleUsageMap.put(orderGoods.getTruckDemand(),
                                     vehicleUsageMap.get(orderGoods.getTruckDemand())
                                             .add(childSum));