diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index f3033a3..12b3422 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -133,8 +133,6 @@ public class AppOrderController { // 拿到所有的子订单 List vvTradeOrderLineEntities = vvTradeOrderLineDao.selectAppTradeOrderByTradeOrderIds(tradeOrderIds); - Map> listGroupByTradeOrderId = SanUtils.list2GroupBy(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId); - // 对订单进行排序,必须按照子单的顺序 Map vvTradeOrderEntityMap = SanUtils.list2Map(tradeOrderEntities, VvTradeOrderEntity::getId); @@ -145,8 +143,6 @@ public class AppOrderController { Map vvPackageEntityMap = SanUtils.list2Map(packageEntities, VvPackageEntity::getTrackNumber); - List vvOrderListResps = new ArrayList<>(); - // 如果有tracknumber ,则以 trader_order_id_sku_id 分组, 如果有trackNumber ,则以 trader_order_id_track_number_sku_id 分组 Map> groupBytrader_order_id_sku_id = new HashMap<>(); for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) { @@ -172,12 +168,15 @@ public class AppOrderController { keyMap.put(key, vvTradeOrderLineTrackNumberDTO); groupBytrader_order_id_sku_id.put(tradeOrderId, keyMap); } + + List appTradeOrderPackageDTOList = new ArrayList<>(); for (Long tradeOrderId : tradeOrderIds) { Map stringVvTradeOrderLineTrackNumberDTOMap = groupBytrader_order_id_sku_id.get(tradeOrderId); VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderEntityMap.get(tradeOrderId); - AppTradeOrderPackageDTO appTradeOrderPackageDTO = new AppTradeOrderPackageDTO(); + AppTradeOrderPackageDTO appTradeOrderPackageDTO = new AppTradeOrderPackageDTO(); VvPackageEntity packageDTO = null; + List appTradeOrderLineDTOList = new ArrayList<>(); for (Map.Entry mapEntry : stringVvTradeOrderLineTrackNumberDTOMap.entrySet()) { VvTradeOrderLineTrackNumberDTO vvTradeOrderLineTrackNumberDTO = mapEntry.getValue(); VvTradeOrderLineEntity vvTradeOrderLineEntity = vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities().get(0); @@ -185,7 +184,7 @@ public class AppOrderController { AppTradeOrderLineDTO appTradeOrderLineResp = new AppTradeOrderLineDTO(); BeanUtils.copyProperties(vvTradeOrderLineEntity, appTradeOrderLineResp); - List vvTradeOrderLineEntityList = vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities(); + List vvTradeOrderLineEntityList = vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities(); // 设置促销价格和销售价格 BigDecimal promotionPrice = BigDecimal.ZERO; BigDecimal salePrice = BigDecimal.ZERO; @@ -206,9 +205,11 @@ public class AppOrderController { appTradeOrderLineResp.setNum(vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities().size()); appTradeOrderLineResp.setTradeOrderLineIdList(tradeOrderLineIdList); appTradeOrderLineResp.setTrackNumber(vvTradeOrderLineTrackNumberDTO.getTrackNumber()); + appTradeOrderLineDTOList.add(appTradeOrderLineResp); } + appTradeOrderPackageDTO.setAppTradeOrderLineDTOList(appTradeOrderLineDTOList); appTradeOrderPackageDTO.setVvPackageEntity(packageDTO); appTradeOrderPackageDTO.setTradeOrderEntity(vvTradeOrderEntity); appTradeOrderPackageDTOList.add(appTradeOrderPackageDTO);