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

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

@@ -142,8 +142,8 @@ public class OrderGoodsStatusLazyComponent implements InitializingBean {
                         }
                     }
                     orderFeign.rollbackOrderWeight(param);
-                    //更新已完结,并设置剩余吨数为0
-                    orderGoodsDao.updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(orderGoods.getId(), OrderGoodsStatusEnum.Status.COMPLETED.getCode());
+                    //更新已完结
+                    orderGoodsDao.updateOrderGoodsStatusByOrderGoodsNo(orderGoodsNo, OrderGoodsStatusEnum.Status.COMPLETED.getCode());
 
                     log.info("删除redis ORDER_GOODS_STATUS_LAZY id: {}", orderGoodsId.getValue());
                 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java

@@ -159,8 +159,7 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     @Override
     public boolean updateOrderGoodsStatusAndRollbackResidueWeightByOrderGoodsNo(Integer orderGoodsId, Integer status) {
         return update(lUdWrapper().eq(OrderGoods :: getGoodsId,orderGoodsId)
-                .set(OrderGoods :: getOrderGoodsStatus, status)
-                .set(OrderGoods::getResidueTransportWeight, BigDecimal.ZERO))
+                .set(OrderGoods :: getOrderGoodsStatus, status))
                 ;
     }
 

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

@@ -654,21 +654,15 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
                 if (!orderInfoFeign.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
                     for (OrderGoods orderGoods : orderGoodsList) {
-                        OrderGoods update = new OrderGoods();
-                        update.setId(orderGoods.getId());
                         truckDemandMap.put(orderGoods.getTruckDemand(),
                                 truckDemandMap.get(orderGoods.getTruckDemand())
                                         .add(orderGoods.getResidueTransportWeight()));
-                        orderGoodsDao.updateEntityByKey(update);
                     }
                 } else {
                     for (OrderGoods orderGoods : orderGoodsList) {
-                        OrderGoods update = new OrderGoods();
-                        update.setId(orderGoods.getId());
                         vehicleUsageMap.put(orderGoods.getVehicleUsage(),
                                 vehicleUsageMap.get(orderGoods.getVehicleUsage())
                                         .add(orderGoods.getResidueTransportWeight()));
-                        orderGoodsDao.updateEntityByKey(update);
                     }
                 }
                 //归还吨数
@@ -736,7 +730,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 break;
 
             case 3: //取消未拉运+未到达货源地吨数
-                List<OrderChild> orderChildren = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
+                List<Integer> list = new LinkedList<>();
+                list.add(OrderChildEnum.Status.PLATFORM_CANCEL.getCode());
+                list.add(OrderChildEnum.Status.OWNER_CANCEL.getCode());
+
+                List<OrderChild> orderChildren = orderChildDao.listOrderChildByOrderNoAndStatus(orderNo, list);
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
                 Map<String, List<OrderChild>> orderChildMap = new HashMap<>();
                 if (CollectionUtil.isNotEmpty(orderChildren)) {
@@ -762,9 +760,9 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                             truckDemandMap.put(orderGoods.getTruckDemand(),
                                     truckDemandMap.get(orderGoods.getTruckDemand())
                                             .add(childSum));
-                        }
-
                             orderGoodsDao.updateEntityByKey(update);
+
+                        }
                     }
                 } else {
                     for (OrderGoods orderGoods : orderGoodsList) {
@@ -785,9 +783,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                             vehicleUsageMap.put(orderGoods.getTruckDemand(),
                                     vehicleUsageMap.get(orderGoods.getTruckDemand())
                                             .add(childSum));
-                        }
                             orderGoodsDao.updateEntityByKey(update);
                         }
+
+                    }
                 }
                 //归还吨数
                 if (!orderInfoFeign.getTruckDemand().equals(TruckDemandEnum.TruckType.PLATFORM_ANY_CAR.getCode())) {
@@ -814,7 +813,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 break;
 
             default:
-                throw new RuntimeException();
+                return;
 
         }
 
@@ -828,6 +827,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
             if (!orderFeign.saveOrderSettlementJobRecord(orderNo).succeed()) {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用结算单锁定失败");
             }
+
         } catch (Exception e) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
 

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

@@ -445,7 +445,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     OrderGoods update = new OrderGoods();
                     update.setId(orderGoods.getId());
                     update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
-                    update.setResidueTransportWeight(BigDecimal.ZERO);
                     orderGoodsDao.updateEntityByKey(update);
                 }
                 break;
@@ -485,7 +484,6 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     OrderGoods update = new OrderGoods();
                     update.setId(orderGoods.getId());
                     update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
-                    update.setResidueTransportWeight(BigDecimal.ZERO);
                     orderGoodsDao.updateEntityByKey(update);
                 }
                 break;

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -246,7 +246,7 @@ public class OrderGoodsSqlProvider {
     public String updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value ="residueWeight") BigDecimal residueWeight, @Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value ="status") Integer status,@Param(value ="id") Integer id){
         String sql = new SQL() {{
             UPDATE("order_goods")
-                    .SET("residue_transport_weight = residue_transport_weight - #{residueWeight}")
+                    .SET("residue_transport_weight = residue_transport_weight + #{residueWeight}")
                     .SET("already_transport_weight = already_transport_weight - #{alreadyWeight}")
                     .SET("status = #{status}")