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

performance-web/src/main/java/com/clx/performance/component/OrderCancelComponent.java

@@ -237,21 +237,25 @@ public class OrderCancelComponent implements InitializingBean {
 
             RollbackOrderWeightParam rollbackOrderWeightParam = new RollbackOrderWeightParam();
             rollbackOrderWeightParam.setOrderNo(orderGoods.getOrderNo());
-            BigDecimal residueWeight = orderGoods.getResidueTransportWeight().add(weight);
-            rollbackOrderWeightParam.setResidueWeight(residueWeight);
+            rollbackOrderWeightParam.setResidueWeight(weight);
 
             //归还吨数
             if (!truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
                 if (truckDemand.equals(TruckDemandEnum.TruckType.PLATFORM_CAR.getCode())) {
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
-                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
                 } else if (truckDemand.equals(TruckDemandEnum.TruckType.OWNER_CAR.getCode())) {
-                    rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
                 }
             } else {
-                rollbackOrderWeightParam.setPlatformResidueCarryWeight(residueWeight);
-                rollbackOrderWeightParam.setOwnResidueCarryWeight(residueWeight);
+                if (orderGoods.getVehicleUsage().equals(VehicleUsageEnum.Status.OWN.getCode())) {
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(BigDecimal.ZERO);
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(weight);
+                } else {
+                    rollbackOrderWeightParam.setPlatformResidueCarryWeight(weight);
+                    rollbackOrderWeightParam.setOwnResidueCarryWeight(BigDecimal.ZERO);
+                }
             }
 
             Result<Object> result = orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);

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

@@ -806,7 +806,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         String orderNo = param.getOrderNo();
         if (OwnerAccountEnum.OrderChildTypeStatus.ORDINARY.getCode().equals(param.getOrderType())) {
             List<OwnerRunningWaterRecord> list = ownerRunningWaterRecordDao.getOwnerRunningWaterRecord(orderNo);
-            if (null == list || list.size() != 2) {
+            if (CollectionUtil.isEmpty(list)) {
                 log.info("解冻预付运费、保证金账户出错,查询出冻结流水有问题,参数为{}", JSONUtil.parse(param));
                 return;
             }
@@ -823,7 +823,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                     entity.setFrozenBalance(runningWaterRecord.getAlterationBalance());
                     flag += ownerAccountDao.thawAccount(entity, LocalDateTime.now());
                 }
-                if (flag == 2) {
+                if (flag == list.size()) {
                     log.info("解冻预付运费、保证金账户，账户扣款已处理，开始执行插入相关流水");
                     for (OwnerRunningWaterRecord runningWaterRecord : list) {
                         OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(runningWaterRecord.getOwnerUserNo(), runningWaterRecord.getAccountType());