diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineDTO.java new file mode 100644 index 0000000..187ea91 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineDTO.java @@ -0,0 +1,27 @@ +package com.heyu.api.alibaba.request.mm.order.resp; + +import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + + +@Data +public class AppTradeOrderLineDTO extends VvTradeOrderLineEntity { + + + + /**** + * 子订单列表信息 + */ + private List tradeOrderLineIdList; + + + /*** + * 实际支付金额 + */ + private BigDecimal realPayAmount; +} + + diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineResp.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderPackageDTO.java similarity index 69% rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineResp.java rename to api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderPackageDTO.java index 494ce0f..063e506 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineResp.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderPackageDTO.java @@ -2,12 +2,14 @@ package com.heyu.api.alibaba.request.mm.order.resp; import com.heyu.api.data.entity.vv.VvPackageEntity; import com.heyu.api.data.entity.vv.VvTradeOrderEntity; -import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; import lombok.Data; +import java.util.List; + @Data -public class AppTradeOrderLineResp extends VvTradeOrderLineEntity { +public class AppTradeOrderPackageDTO { + /*** * 订单相关的信息 @@ -21,4 +23,10 @@ public class AppTradeOrderLineResp extends VvTradeOrderLineEntity { */ private VvPackageEntity vvPackageEntity; + + /*** + * 订单列表信息 + */ + private List appTradeOrderLineDTOList; + } 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 21588e0..f3033a3 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 @@ -145,7 +145,7 @@ public class AppOrderController { Map vvPackageEntityMap = SanUtils.list2Map(packageEntities, VvPackageEntity::getTrackNumber); - List vvOrderListResps = new ArrayList<>(); + 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<>(); @@ -172,43 +172,48 @@ public class AppOrderController { keyMap.put(key, vvTradeOrderLineTrackNumberDTO); groupBytrader_order_id_sku_id.put(tradeOrderId, keyMap); } + List appTradeOrderPackageDTOList = new ArrayList<>(); for (Long tradeOrderId : tradeOrderIds) { - VvTradeOrderLineEntity vvTradeOrderLineEntity = listGroupByTradeOrderId.get(tradeOrderId).get(0); Map stringVvTradeOrderLineTrackNumberDTOMap = groupBytrader_order_id_sku_id.get(tradeOrderId); + VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderEntityMap.get(tradeOrderId); + AppTradeOrderPackageDTO appTradeOrderPackageDTO = new AppTradeOrderPackageDTO(); + VvPackageEntity packageDTO = null; for (Map.Entry mapEntry : stringVvTradeOrderLineTrackNumberDTOMap.entrySet()) { VvTradeOrderLineTrackNumberDTO vvTradeOrderLineTrackNumberDTO = mapEntry.getValue(); + VvTradeOrderLineEntity vvTradeOrderLineEntity = vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities().get(0); + + AppTradeOrderLineDTO appTradeOrderLineResp = new AppTradeOrderLineDTO(); - AppTradeOrderLineResp appTradeOrderLineResp = new AppTradeOrderLineResp(); BeanUtils.copyProperties(vvTradeOrderLineEntity, appTradeOrderLineResp); - List vvTradeOrderLineEntityList = vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities(); // 设置促销价格和销售价格 BigDecimal promotionPrice = BigDecimal.ZERO; BigDecimal salePrice = BigDecimal.ZERO; + List tradeOrderLineIdList = new ArrayList<>(); for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { //当时促销价 promotionPrice = promotionPrice.add(tradeOrderLineEntity.getPromotionPrice()); salePrice = salePrice.add(tradeOrderLineEntity.getSalePrice()); + tradeOrderLineIdList.add(tradeOrderLineEntity.getId()); } - vvTradeOrderLineEntity.setPromotionPrice(promotionPrice); vvTradeOrderLineEntity.setSalePrice(salePrice); - // 如果有tracknumber ,则以 trader_order_id_sku_id 分组, 如果有trackNumber ,则以 trader_order_id_track_number_sku_id 分组 if (StringUtils.isNotEmpty(vvTradeOrderLineTrackNumberDTO.getTrackNumber())) { - VvPackageEntity packageDTO = vvPackageEntityMap.get(vvTradeOrderLineTrackNumberDTO.getTrackNumber()); - appTradeOrderLineResp.setVvPackageEntity(packageDTO); + packageDTO = vvPackageEntityMap.get(vvTradeOrderLineTrackNumberDTO.getTrackNumber()); } appTradeOrderLineResp.setNum(vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities().size()); - - VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()); + appTradeOrderLineResp.setTradeOrderLineIdList(tradeOrderLineIdList); appTradeOrderLineResp.setTrackNumber(vvTradeOrderLineTrackNumberDTO.getTrackNumber()); - appTradeOrderLineResp.setTradeOrderEntity(vvTradeOrderEntity); - vvOrderListResps.add(appTradeOrderLineResp); + } + + appTradeOrderPackageDTO.setVvPackageEntity(packageDTO); + appTradeOrderPackageDTO.setTradeOrderEntity(vvTradeOrderEntity); + appTradeOrderPackageDTOList.add(appTradeOrderPackageDTO); } - return R.ok().setData(vvOrderListResps); + return R.ok().setData(appTradeOrderPackageDTOList); } /***