2 Commits d00df6c818 ... 612383f412

Auteur SHA1 Bericht Datum
  wangming 612383f412 Merge remote-tracking branch 'origin/master' 1 dag geleden
  wangming 15c9bf9c6b fix 1 dag geleden

+ 9 - 0
yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java

@@ -74,6 +74,15 @@ public class MyOrderController {
     private final AppConnectMapper appConnectMapper;
     private final DeliveryService deliveryService;
 
+
+    @SuppressWarnings("all")
+    @GetMapping("/queryTrace")
+    @ApiOperation(value = "微信物流-queryTrace")
+    public ResponseEntity<String> queryTrace(@RequestParam(value = "waybillToken") String waybillToken) {
+        CullenUtils.validateDataThrowException(waybillToken==null,"waybillToken不能为空...");
+        return ResponseEntity.ok(WxProviderServiceImpl.queryTrace(waybillToken));
+    }
+
     @SuppressWarnings("all")
     @GetMapping("/getWaybillToken")
     @ApiOperation(value = "微信物流-获取waybill_token")

+ 1 - 1
yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -168,7 +168,7 @@ public class OrderController {
         }
         orderParam.setDvyTime(new Date());
         orderParam.setUpdateTime(new Date());
-        orderParam.setHbOrderStatus(OrderStatus.CONSIGNMENT.value());
+        //orderParam.setHbOrderStatus(OrderStatus.CONSIGNMENT.value());
         orderParam.setUserId(order.getUserId());
 
         orderService.delivery(orderParam);

+ 2 - 2
yami-shop-platform/src/main/resources/application.yml

@@ -1,8 +1,8 @@
 spring:
   # 环境 dev|prod|docker quartz定时任务
   profiles:
-    active: dev
-#    active: prod
+#    active: dev
+    active: prod
   #文件上传设置
   servlet:
 

+ 21 - 0
yami-shop-wx/src/main/java/com/yami/shop/wx/service/impl/WxProviderServiceImpl.java

@@ -529,6 +529,27 @@ public class WxProviderServiceImpl implements WxProviderService {
         return responseString;
     }
 
+    @SneakyThrows
+    public static String queryTrace(String waybillToken) {
+        JSONObject json = new JSONObject();
+        json.put("waybill_token",waybillToken);
+        AccessToken accessToken = AccessTokenApi.getAccessToken(WxConstants.APPLET_APPID, WxConstants.APPLET_SECRET);
+        String url = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/query_trace?access_token=" + accessToken.getToken();
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Content-Type", "application/json");
+        StringEntity requestBody = new StringEntity(json.toString(), ContentType.APPLICATION_JSON.withCharset("UTF-8"));
+        httpPost.setEntity(requestBody);
+        CloseableHttpResponse response = httpClient.execute(httpPost);
+        HttpEntity responseEntity = response.getEntity();
+        String responseString = EntityUtils.toString(responseEntity, "UTF-8");
+        log.info(responseString);
+        response.close();
+        httpClient.close();
+        return responseString;
+    }
+
+
     public static void main(String[] args) {
 
     }