修改sqlProvider

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

@@ -3,11 +3,9 @@ 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.param.feign.RollbackOrderWeightParam;
 import com.clx.order.params.PageOrderGoodsListParam;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.sqlProvider.OrderGoodsSqlProvider;
-import com.clx.performance.sqlProvider.OrderGoodsTruckBindSqlProvider;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
 import com.clx.performance.vo.pc.OrderGoodsVO;
 import org.apache.ibatis.annotations.Param;
@@ -34,7 +32,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
     String getMaxOrderGoodsId();
 
     @SelectProvider(type = OrderGoodsSqlProvider.class, method = "pageOrderGoodsList")
-    IPage<OrderGoodsVO> pageOrderGoodsList(Page<OrderGoodsVO> page, PageOrderGoodsListParam param);
+    IPage<OrderGoodsVO> pageOrderGoodsList(@Param("page") Page<OrderGoodsVO> page, @Param("param") PageOrderGoodsListParam param);
 
     @Update(" update order_goods set " +
             " residue_transport_weight = residue_transport_weight-#{weight}," +

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

@@ -7,6 +7,7 @@ import com.clx.performance.enums.OrderGoodsStopEnum;
 import com.clx.performance.enums.PendingOrderWayStatusEnum;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.vo.app.OrderGoodsAPPVO;
+import com.clx.performance.vo.pc.OrderGoodsVO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
@@ -21,7 +22,7 @@ public class OrderGoodsSqlProvider {
         return "SELECT s.order_goods_no FROM  `order_goods` s WHERE s. id = ( SELECT max(id) FROM order_goods )";
     }
 
-    public String pageOrderGoodsList(@Param("param") PageOrderGoodsListParam param) {
+    public String pageOrderGoodsList(@Param("page") Page<OrderGoodsVO> page, @Param("param") PageOrderGoodsListParam param) {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
@@ -182,7 +183,7 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
-    public String pageOrderGoodsList(@Param("batchNumber") Long batchNumber) {
+    public String findOrderGoodsByBatchNumber(@Param("batchNumber") Long batchNumber) {
         String sql = new SQL() {{
             SELECT("a.id, a.order_no," +
                     " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
@@ -207,8 +208,4 @@ public class OrderGoodsSqlProvider {
         return sql;
     }
 
-    public String findOrderGoodsByBatchNumber(Long batchNumber){
-        return null;
-    }
-
 }