yshop后台新增了物流快递查询

yshop-shop/pom.xml

@@ -17,15 +17,23 @@
     </properties>
 
     <dependencies>
+        <!--    tools 模块包含了 common 和 logging 模块    -->
         <dependency>
             <groupId>co.yixiang</groupId>
-            <artifactId>yshop-logging</artifactId>
+            <artifactId>yshop-tools</artifactId>
             <version>2.0</version>
         </dependency>
+
         <dependency>
             <groupId>co.yixiang</groupId>
             <artifactId>yshop-mp</artifactId>
             <version>2.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>co.yixiang</groupId>
+                    <artifactId>yshop-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java

@@ -9,6 +9,8 @@ import co.yixiang.aop.log.Log;
 import co.yixiang.constant.ShopConstants;
 import co.yixiang.enums.OrderInfoEnum;
 import co.yixiang.exception.BadRequestException;
+import co.yixiang.express.ExpressService;
+import co.yixiang.express.dao.ExpressInfo;
 import co.yixiang.modules.activity.service.YxStorePinkService;
 import co.yixiang.modules.activity.service.dto.YxStorePinkDTO;
 import co.yixiang.modules.shop.domain.YxStoreOrder;
@@ -21,6 +23,7 @@ import co.yixiang.modules.shop.service.dto.YxExpressDTO;
 import co.yixiang.modules.shop.service.dto.YxStoreOrderDTO;
 import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria;
 import co.yixiang.modules.shop.service.dto.YxWechatUserDTO;
+import co.yixiang.modules.shop.service.param.ExpressParam;
 import co.yixiang.mp.service.WxMpTemplateMessageService;
 import co.yixiang.mp.service.YxTemplateService;
 import co.yixiang.mp.service.YxWechatTemplateService;
@@ -56,11 +59,13 @@ public class StoreOrderController {
     private final RedisTemplate<String, String> redisTemplate;
     private final YxTemplateService templateService;
     private final YxStorePinkService  storePinkService;
+    private final ExpressService expressService;
 
     public StoreOrderController(YxStoreOrderService yxStoreOrderService, YxStoreOrderStatusService yxStoreOrderStatusService,
                                 YxExpressService yxExpressService, YxWechatUserService wechatUserService,
                                 RedisTemplate<String, String> redisTemplate,
-                                YxTemplateService templateService,YxStorePinkService storePinkService) {
+                                YxTemplateService templateService,YxStorePinkService storePinkService,
+                                ExpressService expressService) {
         this.yxStoreOrderService = yxStoreOrderService;
         this.yxStoreOrderStatusService = yxStoreOrderStatusService;
         this.yxExpressService = yxExpressService;
@@ -68,6 +73,7 @@ public class StoreOrderController {
         this.redisTemplate = redisTemplate;
         this.templateService = templateService;
         this.storePinkService = storePinkService;
+        this.expressService = expressService;
     }
 
     @GetMapping(value = "/data/count")
@@ -327,4 +333,18 @@ public class StoreOrderController {
         yxStoreOrderService.update(resources);
         return new ResponseEntity(HttpStatus.OK);
     }
+
+
+    /**@Valid
+     * 获取物流信息,根据传的订单编号 ShipperCode快递公司编号 和物流单号,
+     */
+    @PostMapping("/yxStoreOrder/express")
+    @ApiOperation(value = "获取物流信息",notes = "获取物流信息",response = ExpressParam.class)
+    public ResponseEntity express( @RequestBody ExpressParam expressInfoDo){
+        ExpressInfo expressInfo = expressService.getExpressInfo(expressInfoDo.getOrderCode(),
+                expressInfoDo.getShipperCode(), expressInfoDo.getLogisticCode());
+        if(!expressInfo.isSuccess()) throw new BadRequestException(expressInfo.getReason());
+        return new ResponseEntity(expressInfo, HttpStatus.OK);
+    }
+
 }

yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java

@@ -115,6 +115,8 @@ public class YxStoreOrderDTO implements Serializable {
     // 快递名称/送货人姓名
     private String deliveryName;
 
+    private String deliverySn;
+
     // 发货类型
     private String deliveryType;
 

yshop-shop/src/main/java/co/yixiang/modules/shop/service/param/ExpressParam.java

@@ -0,0 +1,18 @@
+package co.yixiang.modules.shop.service.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName ExpressParam
+ * @Author hupeng <610796224@qq.com>
+ * @Date 2019/12/9
+ **/
+@Data
+public class ExpressParam implements Serializable {
+    //@NotBlank()
+    private String orderCode;
+    private String shipperCode;
+    private String logisticCode;
+}

yshop-system/pom.xml

@@ -30,12 +30,6 @@
             </exclusions>
         </dependency>
 
-        <!--    tools 模块包含了 common 和 logging 模块    -->
-        <dependency>
-            <groupId>co.yixiang</groupId>
-            <artifactId>yshop-tools</artifactId>
-            <version>2.0</version>
-        </dependency>
 
         <dependency>
             <groupId>co.yixiang</groupId>

yshop-system/src/main/resources/config/application.yml

@@ -51,3 +51,10 @@ rsa:
 # sm.ms 图床的 token
 smms:
   token: 1oOP3ykFDI0K6ifmtvU7c8Y1eTWZSlyl
+
+yshop:
+  # 快鸟物流查询配置
+  express:
+    enable: true
+    appId: 1607734
+    appKey: 81f43a2e-f504-45c4-9b54-2637d59f8190