查询物流详情接口增加用户退款发货 有todo待处理

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/express/KylinOrderExpressVo.java

@@ -31,6 +31,8 @@ public class KylinOrderExpressVo implements Serializable , Cloneable{
     private String mailno;
     @ApiModelProperty(value = "快递状态")
     private Integer expressStatus;
+    @ApiModelProperty(value = "1上门取件 2自主发货")
+    private Integer sendExpressType;
     @ApiModelProperty(value = "物流数据")
     LinkedList<KylinOrderExpressRouteVo> routeList;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/PerformancesExpressInfoController.java

@@ -28,7 +28,7 @@ public class PerformancesExpressInfoController {
     private PerformancesExpressInfoServiceImpl performancesExpressInfoServiceImpl;
 
     @GetMapping("orderRoute/{orderTicketsId}")
-    @ApiOperation("获取物流信息") // 前端使用
+    @ApiOperation("获取物流-正在发货") // 前端使用
     @ApiImplicitParam(name = "orderTicketsId", value = "订单ID", required = true, dataType = "String", paramType = "path")
     public ResponseDto<KylinOrderExpressVo> orderRouteDetail(@PathVariable() String orderTicketsId) {
         KylinOrderExpressVo routeVoList = performancesExpressInfoServiceImpl.orderRouteDetail(orderTicketsId);
@@ -39,4 +39,16 @@ public class PerformancesExpressInfoController {
         }
     }
 
+    @GetMapping("orderRoute/{orderTicketsId}")
+    @ApiOperation("获取物流信息-用户发货") // 前端使用
+    @ApiImplicitParam(name = "orderTicketsId", value = "订单ID", required = true, dataType = "String", paramType = "path")
+    public ResponseDto<KylinOrderExpressVo> orderRefundRouteDetail(@PathVariable() String orderTicketsId) {
+        KylinOrderExpressVo routeVoList = performancesExpressInfoServiceImpl.orderRefundRouteDetail(orderTicketsId);
+        if (null != routeVoList) {
+            return ResponseDto.success(routeVoList);
+        } else {
+            return ResponseDto.failure(ErrorMapping.get("20800"));
+        }
+    }
+
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -562,6 +562,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderExpressVo.setOrderExpressCode(OrderExpressCode);
                 kylinOrderExpressVo.setMailno((String) hashMapResult.get("mailno"));
                 kylinOrderExpressVo.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS2);
+                kylinOrderExpressVo.setSendExpressType(sendExpressType);
                 dataUtils.setOrderRefundExpressInfo(orderTicketVo.getOrderTicketsId(), kylinOrderExpressVo);
             }
         } else if (sendExpressType == 2) { // 自主发货
@@ -587,6 +588,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             kylinOrderExpressVo.setOrderExpressCode(OrderExpressCode);
             kylinOrderExpressVo.setMailno(expressNumber);
             kylinOrderExpressVo.setExpressStatus(KylinTableStatusConst.ORDER_EXPRESS_STATUS2);
+            kylinOrderExpressVo.setSendExpressType(sendExpressType);
             dataUtils.setOrderRefundExpressInfo(orderTicketVo.getOrderTicketsId(), kylinOrderExpressVo);
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/PerformancesExpressInfoServiceImpl.java

@@ -40,4 +40,18 @@ public class PerformancesExpressInfoServiceImpl {
         }
         return expressInfo;
     }
+
+    public KylinOrderExpressVo orderRefundRouteDetail(String orderTicketsId) {
+        KylinOrderExpressVo expressInfo = dataUtils.getOrderRefundExpressInfo(orderTicketsId);
+        if (expressInfo.getSendExpressType() == 1) {
+            LinkedList<KylinOrderExpressRouteVo> routeList = dataUtils.getOrderExpressRoute(orderTicketsId);
+            if (null != expressInfo) {
+                expressInfo.setRouteList(routeList);
+            }
+        } else {
+            // TODO: jxl 2021/8/27 查询物流信息
+            expressInfo.setRouteList(null);
+        }
+        return expressInfo;
+    }
 }
\ No newline at end of file