优化相关代码

performance-api/src/main/java/com/clx/order/params/OrderGoodsEditParams.java → performance-api/src/main/java/com/clx/performance/param/pc/OrderGoodsEditParams.java

-package com.clx.order.params;
+package com.clx.performance.param.pc;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -56,9 +56,6 @@ public class OrderGoodsEditParams {
     @ApiModelProperty("创建人姓名")
     private String userName;
 
-    @ApiModelProperty("批次号")
-    private Long batchNumber;
-
     @ApiModelProperty("修改时间")
     private String modifiedTime;
 

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

 package com.clx.performance.param.pc;
 
-import com.clx.order.params.OrderGoodsEditParams;
 import com.msl.common.convertor.field.Converted;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -8,7 +7,6 @@ import lombok.Setter;
 
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
-import java.util.List;
 
 /**
  * @ClassName UpdateEditOrderGoodsParam

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

 package com.clx.performance.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.order.params.OrderGoodsEditParams;
+import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;

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

@@ -3,7 +3,7 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.order.params.OrderGoodsEditParams;
+import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.enums.OrderGoodsStatusEnum;

performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java

@@ -3,7 +3,7 @@ package com.clx.performance.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.order.params.OrderGoodsEditParams;
+import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;

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

@@ -9,7 +9,7 @@ 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.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.component.GoodsOrderTruckRecordComponent;
@@ -272,7 +272,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前货单提取吨数不应小于已经拉运的吨数");
         }
 
-        if (orderChildList.size() < oldOrderGoods.getNeedTruckNum()) {
+        if (orderChildList.size() < orderGoodsParams.getNeedTruckNum()) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "需要车辆数不能小于当前已经接单的运单数量");
         }
 

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

 package com.clx.performance.sqlProvider;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.clx.order.params.OrderGoodsEditParams;
+import com.clx.performance.param.pc.OrderGoodsEditParams;
 import com.clx.performance.param.pc.PageOrderGoodsListParam;
 import com.clx.performance.enums.OrderGoodsStatusEnum;
 import com.clx.performance.enums.OrderGoodsStopEnum;