|
@@ -1196,7 +1196,11 @@ public class StoreOrderScrmController extends AppBaseController {
|
|
|
if (order.getStatus() <2) {
|
|
if (order.getStatus() <2) {
|
|
|
throw new CustomException("未发货订单不能查询");
|
|
throw new CustomException("未发货订单不能查询");
|
|
|
}
|
|
}
|
|
|
- return orderService.getExpress(order);
|
|
|
|
|
|
|
+ try {
|
|
|
|
|
+ return orderService.getExpress(order);
|
|
|
|
|
+ }catch (Exception e){
|
|
|
|
|
+ return R.ok().put("deliveryId", order.getDeliveryId());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|