修改BUG

performance-api/src/main/java/com/clx/performance/param/pc/OrderCancelParam.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 public class OrderCancelParam {
@@ -20,4 +21,6 @@ public class OrderCancelParam {
 
     @ApiModelProperty("取消原因")
     private String cancelReason;
+
+    private List<String> childNoList;
 }

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

@@ -62,7 +62,7 @@ public class OrderCancelComponent implements InitializingBean {
 
     private final OrderChildLogService orderChildLogService;
 
-    public void ownerProcess(OrderCancelParam param) {
+    public List<String> ownerProcess(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
         Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
@@ -186,6 +186,8 @@ public class OrderCancelComponent implements InitializingBean {
             integralMqService.orderChildFinish(childNo);
         }
 
+        return childNoList;
+
     }
 
     public void backFillTonnage(OrderGoods orderGoods, BigDecimal weight) {

performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java

@@ -134,4 +134,6 @@ public interface OrderChildDao extends BaseDao<OrderChildMapper, OrderChild, Int
     OrderChildVO findArtificialCancelOrder(String orderChildNo);
 
     IPage<OrderChildVO> orderChildCancelRecord(PageParam pageParam);
+
+    List<OrderChild> selectInOrderChildNoList(List<String> childNoList);
 }

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

@@ -394,4 +394,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
         Page<OrderGoodsVO> page = Page.of(param.getPage(), param.getPageSize());
         return baseMapper.orderChildCancelRecord(page);
     }
+
+    @Override
+    public List<OrderChild> selectInOrderChildNoList(List<String> childNoList) {
+        return baseMapper.selectList(lQrWrapper()
+                .in(OrderChild::getChildNo, childNoList)
+        );    }
 }

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

@@ -325,8 +325,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     @Transactional(rollbackFor = Exception.class)
     public void ownerCancelOrderPre(OrderCancelParam param) {
         String orderNo = param.getOrderNo();
-        orderCancelComponent.ownerProcess(param);
-
+        List<String> childNoList = orderCancelComponent.ownerProcess(param);
+        param.setChildNoList(childNoList);
         OrderCancelReasonParam orderCancelReasonParam = new OrderCancelReasonParam();
         orderCancelReasonParam.setOrderNo(orderNo);
         orderCancelReasonParam.setReason(param.getCancelReason());
@@ -589,14 +589,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 break;
 
             case 3: //取消未拉运+未到达货源地吨数
-                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)) {
+                if (CollectionUtil.isNotEmpty(param.getChildNoList())) {
+                    List<OrderChild> orderChildren = orderChildDao.selectInOrderChildNoList(param.getChildNoList());
                     orderChildMap = orderChildren.stream().collect(Collectors.groupingBy(OrderChild::getOrderGoodsNo));
                 }
 

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

@@ -609,7 +609,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
 
                 log.info("取消货单,参数：{}", JSONUtil.parse(param));
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
-                    orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(sum, sum, orderGoodsStatus, orderGoods.getId());
+                    orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(orderGoods.getResidueTransportWeight(), sum, orderGoodsStatus, orderGoods.getId());
                 }
                 break;
             default: