修改BUG

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

@@ -736,7 +736,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)) {
@@ -785,8 +789,9 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                             vehicleUsageMap.put(orderGoods.getTruckDemand(),
                                     vehicleUsageMap.get(orderGoods.getTruckDemand())
                                             .add(childSum));
+                            orderGoodsDao.updateEntityByKey(update);
                         }
-                        orderGoodsDao.updateEntityByKey(update);
+
                     }
                 }
                 //归还吨数