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

@@ -79,14 +79,15 @@ public class MyOrderController {
     @ApiOperation(value = "微信物流-获取waybill_token")
     public ResponseEntity<String> getWaybillToken(@RequestParam(value = "orderNumber") String orderNumber) {
         CullenUtils.validateDataThrowException(orderNumber==null,"订单号不能为空...");
-        AppConnect connect = appConnectMapper.getByUserId(SecurityUtils.getUser().getUserId(), 1);
-        CullenUtils.validateDataThrowException(orderNumber==null,"openid不存在...");
         Order order = orderService.getOrderByOrderNumber(orderNumber);
         CullenUtils.validateDataThrowException(order==null,"订单不存在...");
+        CullenUtils.validateDataThrowException(order.getDvyId()==null,"订单未发货...");
+        AppConnect connect = appConnectMapper.getByUserId(SecurityUtils.getUser().getUserId(), 1);
+        CullenUtils.validateDataThrowException(connect==null,"openid不存在...");
         UserAddrOrder userAddrOrder = userAddrOrderService.getById(order.getAddrOrderId());
         CullenUtils.validateDataThrowException(userAddrOrder==null,"收货地址不存在...");
         Delivery delivery = deliveryService.getById(order.getDvyId());
-        CullenUtils.validateDataThrowException(delivery==null,"订单未发货...");
+        CullenUtils.validateDataThrowException(delivery==null,"物流信息不存在...");
         List<OrderItem> orderItemList = orderItemService.getOrderItemsByOrderNumber(orderNumber);
         CullenUtils.validateDataThrowException(orderItemList.isEmpty(),"订单项不存在...");
         OrderSettlement settlement = orderSettlementService.getOne(new LambdaQueryWrapper<OrderSettlement>().eq(OrderSettlement::getOrderNumber, orderNumber));

yami-shop-api/src/main/java/com/yami/shop/api/listener/ConfirmOrderListener.java

@@ -108,6 +108,7 @@ public class ConfirmOrderListener {
                     }
                     //费用按重量计算,数据是g,现在要按kg计算，20是kg单位
                     double sub = Arith.sub(shopCartOrderDto.getTotalWeight(), Arith.mul(20.0, 1000));
+                    System.out.println("费用按重量计算,数据是g,现在要按kg计算，20是kg单位"+sub);
                     transfee = transport2.getFreightFee().doubleValue();
                     if (sub > 0) {
                         //超过重量的安规则计算，累加费用
@@ -154,6 +155,11 @@ public class ConfirmOrderListener {
         shopCartOrderDto.setTransfee(transfee);
         shopCartOrderDto.setFreeTransfee(freeTransfee);
 
+        System.out.println("最终结果："+shopCartOrderDto);
+    }
 
+    public static void main(String[] args) {
+        double sub = Arith.sub(10, Arith.mul(20.0, 1000));
+        System.out.println(sub);
     }
 }

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

@@ -511,26 +511,22 @@ public class WxProviderServiceImpl implements WxProviderService {
     }
 
 
+    @SneakyThrows
     public static String traceWaybill(TraceWaybill traceWaybill) {
         AccessToken accessToken = AccessTokenApi.getAccessToken(WxConstants.APPLET_APPID, WxConstants.APPLET_SECRET);
         String url = "https://api.weixin.qq.com/cgi-bin/express/delivery/open_msg/trace_waybill?access_token=" + accessToken.getToken();
-        try {
-            CloseableHttpClient httpClient = HttpClients.createDefault();
-            HttpPost httpPost = new HttpPost(url);
-            httpPost.addHeader("Content-Type", "application/json");
-            StringEntity requestBody = new StringEntity(new Gson().toJson(traceWaybill), 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;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return "";
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Content-Type", "application/json");
+        StringEntity requestBody = new StringEntity(new Gson().toJson(traceWaybill), 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) {