优化相关代码

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

@@ -12,6 +12,9 @@ import java.util.List;
 @Setter
 public class OrderGoodsCancelParam {
 
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
     @NotNull(message = "货单编号不能为空")
     @ApiModelProperty("货单编号")
     private String orderGoodsNo;

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.enums.VehicleUsageEnum;
 import com.clx.order.feign.OrderFeign;
+import com.clx.order.param.feign.OrderCancelReasonParam;
 import com.clx.order.param.feign.RollbackOrderWeightParam;
 import com.clx.order.params.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
@@ -388,7 +389,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     update.setResidueTransportWeight(BigDecimal.ZERO);
                     orderGoodsDao.updateEntityByKey(update);
                 }
-                return;
+                break;
             case 2:
                 orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.ARRIVE_SEND.getCode());
                 if (CollectionUtils.isNotEmpty(orderChildList)) {
@@ -420,7 +421,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                     update.setResidueTransportWeight(BigDecimal.ZERO);
                     orderGoodsDao.updateEntityByKey(update);
                 }
-                return;
+                break;
             case 3:
                 orderChildList = orderChildDao.selectResidueWeightByOrderGoodsNo(orderGoods.getOrderGoodsNo(), OrderChildEnum.Status.LOAD.getCode(), goodsCancelParam.getTruckList());
                 if (CollectionUtils.isNotEmpty(orderChildList)) {
@@ -447,11 +448,20 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
                 if (orderFeign.rollbackOrderWeight(param).succeed()) {
                     orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(BigDecimal.ZERO, sum, OrderGoodsStatusEnum.Status.CANCEL.getCode(), orderGoods.getId());
                 }
-                return;
+                break;
             default:
                 throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "参数类型有误");
 
         }
+        OrderCancelReasonParam orderCancelReasonParam = new OrderCancelReasonParam();
+        orderCancelReasonParam.setOrderNo(goodsCancelParam.getOrderNo());
+        orderCancelReasonParam.setOrderGoodsNo(goodsCancelParam.getOrderGoodsNo());
+        orderCancelReasonParam.setReason(goodsCancelParam.getCancelReason());
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        orderCancelReasonParam.setCreateNo(loginUserInfo.getUserNo());
+        orderCancelReasonParam.setCreateName(loginUserInfo.getUserName());
+
+        orderFeign.orderCancelReason(orderCancelReasonParam);
 
 
     }