修改BUG

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

@@ -351,9 +351,11 @@ public class OrderCancelServiceImpl implements OrderCancelService {
         String orderNo = param.getOrderNo();
         List<OrderGoods> orderGoodsList = null;
         Integer orderStatusCode = OrderEnum.Status.CANCELED.getCode();
+        log.info("+++++++++++++++++++++++++");
 
         switch (param.getCancelType()) {
             case 1: //单纯取消订单
+                log.info("1:单纯取消订单");
                 if (CollectionUtil.isNotEmpty(orderChildDao.getOrderChildByOrderNo(orderNo))) {
                     throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前订单已发生变化,请重新选择取消方式");
                 }
@@ -378,6 +380,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 }
                 break;
             case 2: //取消未拉运吨数的货单
+                log.info("2:取消未拉运吨数的货单");
+
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
 
                 for (OrderGoods orderGoods : orderGoodsList) {
@@ -404,6 +408,8 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 break;
 
             case 3: //取消未拉运+未到达货源地吨数
+                log.info("3:取消未拉运+未到达货源地吨数");
+
                 List<OrderChild> orderChildren = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
                 log.info("执行货主取消未拉运+未到达货源地吨数,当前运单个数"+ orderChildren.size());
                 List<Integer> ids = new LinkedList<>();
@@ -459,6 +465,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 break;
 
             default:
+                log.info("===================");
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数有误");
 
         }

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

@@ -407,11 +407,8 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Transactional(rollbackFor = Exception.class)
     public void orderGoodsCancel(OrderGoodsCancelParam goodsCancelParam) {
         String orderGoodsNo = goodsCancelParam.getOrderGoodsNo();
-        Optional<OrderGoods> optional = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo);
-        if (!optional.isPresent()) {
-            return;
-        }
-        OrderGoods orderGoods = optional.get();
+        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo).orElseThrow(PerformanceResultEnum.HTTP_ERROR, "数据错误");
+
         List<OrderChild> orderChildList = null;
         BigDecimal residueWeight = null;
         BigDecimal sum = BigDecimal.ZERO;