quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2025-11-16 20:40:04 +08:00
parent 451904cd3f
commit 5069216682
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
View File

@ -165,6 +165,7 @@ public class AdminOrderController {
/*** /***
* 订单详情 * 订单详情
*
* /mm/order/detail * /mm/order/detail
*/ */
@RequestMapping("/detail") @RequestMapping("/detail")
@ -215,12 +216,15 @@ public class AdminOrderController {
} }
VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(vvTradeOrderLineEntityList.get(0).getTradeOrderId()); VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(vvTradeOrderLineEntityList.get(0).getTradeOrderId());
VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvOrderRequest.getTrackNumber()); VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvOrderRequest.getTrackNumber());
if(vvPackageEntity == null ){ if(vvPackageEntity == null ){
vvPackageEntity = new VvPackageEntity(); vvPackageEntity = new VvPackageEntity();
} }
if (CollectionUtils.isNotEmpty(vvOrderRequest.getPackageImageUrls())) { if (CollectionUtils.isNotEmpty(vvOrderRequest.getPackageImageUrls())) {
vvPackageEntity.setPackageImageUrl(JSON.toJSONString(vvOrderRequest.getPackageImageUrls())); vvPackageEntity.setPackageImageUrl(JSON.toJSONString(vvOrderRequest.getPackageImageUrls()));
} }
vvPackageEntity.setLogisticsCompany(vvOrderRequest.getLogisticsCompany()); vvPackageEntity.setLogisticsCompany(vvOrderRequest.getLogisticsCompany());
vvPackageEntity.setShippingAmount(vvOrderRequest.getShippingAmount()); vvPackageEntity.setShippingAmount(vvOrderRequest.getShippingAmount());
vvPackageEntity.setShippingFrom(vvOrderRequest.getShippingFrom()); vvPackageEntity.setShippingFrom(vvOrderRequest.getShippingFrom());
@ -244,6 +248,7 @@ public class AdminOrderController {
OrderStatusEnums.shipping.getStatus(), OrderStatusEnums.shipping.getStatus(),
vvOrderRequest.getUserName()); vvOrderRequest.getUserName());
} }
return R.ok(); return R.ok();
} }
@ -267,7 +272,6 @@ public class AdminOrderController {
vvOrderRequest.getUserName(), vvOrderRequest.getUserName(),
vvOrderRequest.getReason() vvOrderRequest.getReason()
); );
} }
return R.ok(); return R.ok();
} }