diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java index 51b511a..5017da9 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java @@ -165,6 +165,7 @@ public class AdminOrderController { /*** * 订单详情 + * * /mm/order/detail */ @RequestMapping("/detail") @@ -215,12 +216,15 @@ public class AdminOrderController { } VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(vvTradeOrderLineEntityList.get(0).getTradeOrderId()); VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvOrderRequest.getTrackNumber()); + if(vvPackageEntity == null ){ vvPackageEntity = new VvPackageEntity(); } + if (CollectionUtils.isNotEmpty(vvOrderRequest.getPackageImageUrls())) { vvPackageEntity.setPackageImageUrl(JSON.toJSONString(vvOrderRequest.getPackageImageUrls())); } + vvPackageEntity.setLogisticsCompany(vvOrderRequest.getLogisticsCompany()); vvPackageEntity.setShippingAmount(vvOrderRequest.getShippingAmount()); vvPackageEntity.setShippingFrom(vvOrderRequest.getShippingFrom()); @@ -244,6 +248,7 @@ public class AdminOrderController { OrderStatusEnums.shipping.getStatus(), vvOrderRequest.getUserName()); } + return R.ok(); } @@ -267,7 +272,6 @@ public class AdminOrderController { vvOrderRequest.getUserName(), vvOrderRequest.getReason() ); - } return R.ok(); }