开发：货单列表、详情

performance-web/src/main/java/com/clx/performance/controller/app/AppGoodsOrderController.java

@@ -65,7 +65,7 @@ public class AppGoodsOrderController {
     @GetMapping("/getOrderGoodsInfo")
     @UnitCovert(param = false)
     public Result<OrderGoodsVO> getOrderGoodsInfo(@RequestParam String orderGoodsNo) {
-        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNo(orderGoodsNo));
+        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo));
     }
 
 }

performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java

@@ -253,15 +253,16 @@ public class GoodsOrderController {
     @GetMapping("/getOrderGoodsInfo")
     @UnitCovert(param = false)
     public Result<OrderGoodsVO> getOrderGoodsInfo(@RequestParam String orderGoodsNo) {
-        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNo(orderGoodsNo));
+        return Result.ok(orderGoodsService.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo));
     }
 
     @ApiOperation(value = "查看货单列表", notes = "<br>By:胡宇帆")
     @PostMapping("/pageOrderGoodsList")
     @UnitCovert(param = false)
-    public Result<PageData<OrderGoodsVO>> pageOrderGoodsList(@RequestBody @Validated PageOrderGoodsListParam param) {
+    public Result<PageData<OrderGoodsVO>> pageOrderGoodsList(@RequestBody PageOrderGoodsListParam param) {
         if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
             param.setOrderGoodsType(param.getOrderGoodsNo().substring(0, 2));
+            param.setOrderNo(param.getOrderGoodsNo().substring(2));
         }
         IPage<OrderGoodsVO> page = orderGoodsService.pageOrderGoodsList(param);
         return Result.page(page.getRecords(), page.getTotal(), page.getPages());

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

@@ -18,7 +18,10 @@ public interface OrderGoodsDao extends BaseDao<OrderGoodsMapper, OrderGoods, Int
 
     Optional<OrderGoods> getByOrderGoodsNo(String orderGoodsNo);
 
-    Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo);
+    Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo);
+
+    Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo);
+
 
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 }

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

@@ -37,10 +37,21 @@ public class OrderGoodsDaoImpl extends BaseDaoImpl<OrderGoodsMapper, OrderGoods,
     }
 
     @Override
-    public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo) {
+    public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
         return Optional.of(orderGoodsNo)
                 .map(item -> lQrWrapper()
-                        .eq(OrderGoods::getOrderGoodsNo, item)
+                        .eq(OrderGoods::getOrderGoodsType, item.substring(0,2))
+                        .eq(OrderGoods::getOrderGoodsNo, item.substring(2))
+                )
+                .map(super::getOne);
+    }
+
+    @Override
+    public Optional<OrderGoods> getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
+        return Optional.of(orderGoodsNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderGoods::getOrderGoodsType, item.substring(0,2))
+                        .eq(OrderGoods::getOrderGoodsNo, item.substring(2))
                 )
                 .map(super::getOne);
     }

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -13,7 +13,9 @@ import com.msl.common.result.Result;
  * Time 16:45
  */
 public interface OrderGoodsService {
-    OrderGoodsVO getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo);
+    OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo);
+
+    OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo);
 
     IPage<OrderGoodsVO> pageOrderGoodsList(PageOrderGoodsListParam param);
 }

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

@@ -26,8 +26,13 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     private OrderGoodsStruct orderGoodsStruct;
 
     @Override
-    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo) {
-        return orderGoodsDao.getOrderGoodsInfoByOrderGoodsNo(orderGoodsNo).map(orderGoodsStruct::convert).get();
+    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
+        return orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
+    }
+
+    @Override
+    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
+        return orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo).map(orderGoodsStruct::convert).get();
     }
 
     @Override

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

@@ -19,8 +19,8 @@ public class OrderGoodsSqlProvider {
 
     public String pageOrderGoodsList(@Param("page") Page<FeignPageOrderVO> page, @Param("param") PageOrderGoodsListParam param) {
         String sql = new SQL() {{
-            SELECT("a.id, a.order_no, a.order_goods_type " +
-                    " a.order_goods_no, a.order_goods_status, a.extract_weight, " +
+            SELECT("a.id, a.order_no, a.order_goods_type," +
+                    " concat(a.order_goods_type,a.order_goods_no) as order_goods_no, a.order_goods_status, a.extract_weight, " +
                     " a.residue_transport_weight, a.send_address_id, a.send_address_shorter,a.send_longitude," +
                     " a.send_latitude,a.receive_address_id, a.receive_address_shorter,a.receive_longitude,a.receive_latitude," +
                     "a.goods_id, a.goods_name, a.pending_order_way," +
@@ -30,9 +30,8 @@ public class OrderGoodsSqlProvider {
                     " date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time," +
                     " date_format(a.modified_time, '%Y-%m-%d %H:%i:%s') as modified_time," +
                     "a.extract_way,a.need_truck_num,a.senior_logistics_manager_id,a.senior_logistics_manager_name,a.pending_order_freight," +
-                    "a.user_no,a.user_name," +
-                    "a.valid_freight_price ");
-            FROM("order_info a");
+                    "a.user_no,a.user_name");
+            FROM("order_goods a");
 
             if (StringUtils.isNotBlank(param.getBeginTime()) && StringUtils.isNotBlank(param.getEndTime())) {
                 WHERE("a.create_time >= #{param.beginTime}");
@@ -67,6 +66,7 @@ public class OrderGoodsSqlProvider {
             }
             if (StringUtils.isNotBlank(param.getOrderGoodsNo())) {
                 WHERE("a.order_goods_no = #{param.orderGoodsNo}");
+                WHERE("a.order_goods_no = #{param.orderGoodsType}");
             }
             ORDER_BY("a.create_time desc");
         }}.toString();