diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml
index c7db7934..dc203177 100644
--- a/yshop-shop/pom.xml
+++ b/yshop-shop/pom.xml
@@ -17,15 +17,23 @@
+
co.yixiang
- yshop-logging
+ yshop-tools
2.0
+
co.yixiang
yshop-mp
2.0
+
+
+ co.yixiang
+ yshop-common
+
+
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java
index dc03e3b5..8e2b911f 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java
+++ b/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 redisTemplate;
private final YxTemplateService templateService;
private final YxStorePinkService storePinkService;
+ private final ExpressService expressService;
public StoreOrderController(YxStoreOrderService yxStoreOrderService, YxStoreOrderStatusService yxStoreOrderStatusService,
YxExpressService yxExpressService, YxWechatUserService wechatUserService,
RedisTemplate 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);
+ }
+
}
\ No newline at end of file
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java
index 3fc7305c..257ad3e2 100644
--- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java
+++ b/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;
diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/param/ExpressParam.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/param/ExpressParam.java
new file mode 100644
index 00000000..9aceb031
--- /dev/null
+++ b/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;
+}
diff --git a/yshop-system/pom.xml b/yshop-system/pom.xml
index 1a277947..7bfedf0b 100644
--- a/yshop-system/pom.xml
+++ b/yshop-system/pom.xml
@@ -30,12 +30,6 @@
-
-
- co.yixiang
- yshop-tools
- 2.0
-
co.yixiang
diff --git a/yshop-system/src/main/resources/config/application.yml b/yshop-system/src/main/resources/config/application.yml
index d9496d9f..2a8e39c1 100644
--- a/yshop-system/src/main/resources/config/application.yml
+++ b/yshop-system/src/main/resources/config/application.yml
@@ -50,4 +50,11 @@ rsa:
# sm.ms 图床的 token
smms:
- token: 1oOP3ykFDI0K6ifmtvU7c8Y1eTWZSlyl
\ No newline at end of file
+ token: 1oOP3ykFDI0K6ifmtvU7c8Y1eTWZSlyl
+
+yshop:
+ # 快鸟物流查询配置
+ express:
+ enable: true
+ appId: 1607734
+ appKey: 81f43a2e-f504-45c4-9b54-2637d59f8190
\ No newline at end of file