fix

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));