开发：货单详情增加全部地址全称

performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java

@@ -44,6 +44,9 @@ public class OrderGoodsVO {
     @ApiModelProperty("发货地址ID")
     private Integer sendAddressId;
 
+    @ApiModelProperty(value = "发货地址全称")
+    private String sendAddressAll;
+
     @ApiModelProperty("发货地址简称")
     private String sendAddressShorter;
 
@@ -56,6 +59,9 @@ public class OrderGoodsVO {
     @ApiModelProperty("收货地址ID")
     private Integer receiveAddressId;
 
+    @ApiModelProperty(value="收货地址全称")
+    private String reveiveAddressAll;
+
     @ApiModelProperty("收货地址简称")
     private String receiveAddressShorter;
 

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

 package com.clx.performance.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.order.feign.OrderFeign;
 import com.clx.order.params.PageOrderGoodsListParam;
+import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.service.OrderGoodsService;
 import com.clx.performance.struct.OrderGoodsStruct;
@@ -25,9 +27,27 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Autowired
     private OrderGoodsStruct orderGoodsStruct;
 
+    @Autowired
+    private OrderFeign orderFeign;
+
+    @Override
+    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForPC(String orderGoodsNo) {
+        OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForPC(orderGoodsNo).map(orderGoodsStruct::convert).get();
+        String orderNo = orderGoodsVO.getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
+        orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
+        return orderGoodsVO;
+    }
+
     @Override
-    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNo(String orderGoodsNo) {
-        return orderGoodsDao.getOrderGoodsInfoByOrderGoodsNo(orderGoodsNo).map(orderGoodsStruct::convert).get();
+    public OrderGoodsVO getOrderGoodsInfoByOrderGoodsNoForAPP(String orderGoodsNo) {
+        OrderGoodsVO orderGoodsVO = orderGoodsDao.getOrderGoodsInfoByOrderGoodsNoForAPP(orderGoodsNo).map(orderGoodsStruct::convert).get();
+        String orderNo = orderGoodsVO.getOrderNo();
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
+        orderGoodsVO.setReveiveAddressAll(orderInfoFeign.getReveiveAddressAll());
+        orderGoodsVO.setSendAddressAll(orderInfoFeign.getSendAddressAll());
+        return orderGoodsVO;
     }
 
     @Override