diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java index 7c4ee36..afd94e5 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java @@ -108,7 +108,6 @@ public class VvPackageServiceImpl extends ServiceImpl dataDTOS = kuaiDi100DTO.getData(); @@ -147,7 +144,6 @@ public class VvPackageServiceImpl extends ServiceImpl convertTradeOrderLineResp(List vvTradeOrderEntities, List list) { List trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber); + if(CollectionUtils.isNotEmpty(trackNumbers)){ + for (String trackNumber : trackNumbers) { + vvPackageService.selectVvKuaidiAndUpdateData(trackNumber, RoleEnums.admin.getRole()); + } + } + Map vvPackageEntityMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(trackNumbers)) { List packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers); @@ -50,7 +59,6 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic vvTradeOrderLineEntityList.add(tradeOrderLineEntity); } } - /*** * 订单行信息 */ 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 c6a5cb7..39ad076 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 @@ -103,7 +103,6 @@ public class AdminOrderController { List tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId); List tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds); - // 对订单进行排序,必须按照子单的顺序 Map vvTradeOrderEntityMap = SanUtils.list2Map(tradeOrderEntities, VvTradeOrderEntity::getId); List vvTradeOrderEntities = new ArrayList<>(); @@ -147,7 +146,9 @@ public class AdminOrderController { public R detail(@RequestBody VVOrderDetailRequest request) { VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(request.getTradeOrderId()); List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId()); + List vvTradeOrderEntities = SanUtils.asList(vvTradeOrderEntity); + List vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList); VVOrderDetailResp vvOrderDetailResp = new VVOrderDetailResp(); @@ -157,7 +158,7 @@ public class AdminOrderController { VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvTradeOrderEntity.getBuyerId()); vvOrderDetailResp.setVvBuyerEntity(vvBuyerEntity); - return R.ok(); + return R.ok().setData(vvOrderDetailResp); }