修改BUG

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

@@ -64,6 +64,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
     private final OrderChildService orderChildService;
 
 
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void ownerCancelOrderPre(String orderNo) {
@@ -318,6 +319,10 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                 if (!result.succeed()) {
                     throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "远程调用更新订单余量失败");
                 }
+
+                if (!orderFeign.saveOrderSettlementJobRecord(orderNo).succeed()) {
+                    throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用结算单锁定失败");
+                }
             } catch (Exception e) {
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
 
@@ -655,8 +660,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(platformResidueSum);
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(ownResidueSum);
                 }
-                orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
-                return;
+                break;
             case 2: //取消未拉运吨数的货单及订单
                 orderGoodsList = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo);
 
@@ -704,7 +708,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(ownResidueSum);
                 }
                 orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
-                return;
+                break;
 
             case 3: //取消未拉运+未到达货源地吨数
                 List<OrderChild> orderChildren = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
@@ -784,7 +788,26 @@ public class OrderCancelServiceImpl implements OrderCancelService {
                     rollbackOrderWeightParam.setPlatformResidueCarryWeight(platformResidueSum);
                     rollbackOrderWeightParam.setOwnResidueCarryWeight(ownResidueSum);
                 }
-                orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
+                break;
+
+            default:
+                throw new RuntimeException();
+
+        }
+
+
+        try {
+            Result<Object> result = orderFeign.rollbackOrderWeight(rollbackOrderWeightParam);
+            if (!result.succeed()) {
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "远程调用更新订单余量失败");
+            }
+
+            if (!orderFeign.saveOrderSettlementJobRecord(orderNo).succeed()) {
+                throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "货主取消订单失败,原因：远程调用结算单锁定失败");
+            }
+        } catch (Exception e) {
+            throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, e.getMessage());
+
         }
     }