提交修改

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<Long> tradeOrderLineIdList;
+
+
+    /***
+     * 实际支付金额
+     */
+    private BigDecimal realPayAmount;
+}
+
+

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<AppTradeOrderLineDTO> appTradeOrderLineDTOList;
+
 }

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java

@@ -145,7 +145,7 @@ public class AppOrderController {
 
         Map<String, VvPackageEntity> vvPackageEntityMap = SanUtils.list2Map(packageEntities, VvPackageEntity::getTrackNumber);
 
-        List<AppTradeOrderLineResp> vvOrderListResps = new ArrayList<>();
+        List<AppTradeOrderLineDTO> vvOrderListResps = new ArrayList<>();
 
         // 如果有tracknumber  ,则以 trader_order_id_sku_id 分组， 如果有trackNumber ，则以 trader_order_id_track_number_sku_id 分组
         Map<Long, Map<String, VvTradeOrderLineTrackNumberDTO>> 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<AppTradeOrderPackageDTO> appTradeOrderPackageDTOList = new ArrayList<>();
         for (Long tradeOrderId : tradeOrderIds) {
-            VvTradeOrderLineEntity vvTradeOrderLineEntity = listGroupByTradeOrderId.get(tradeOrderId).get(0);
             Map<String, VvTradeOrderLineTrackNumberDTO> stringVvTradeOrderLineTrackNumberDTOMap = groupBytrader_order_id_sku_id.get(tradeOrderId);
+            VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderEntityMap.get(tradeOrderId);
+            AppTradeOrderPackageDTO  appTradeOrderPackageDTO = new AppTradeOrderPackageDTO();
+            VvPackageEntity packageDTO = null;
             for (Map.Entry<String, VvTradeOrderLineTrackNumberDTO> 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<VvTradeOrderLineEntity>  vvTradeOrderLineEntityList = vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities();
                 // 设置促销价格和销售价格
                 BigDecimal promotionPrice = BigDecimal.ZERO;
                 BigDecimal salePrice = BigDecimal.ZERO;
+                List<Long> 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());
+                    packageDTO = vvPackageEntityMap.get(vvTradeOrderLineTrackNumberDTO.getTrackNumber());
-                    appTradeOrderLineResp.setVvPackageEntity(packageDTO);
                 }
 
                 appTradeOrderLineResp.setNum(vvTradeOrderLineTrackNumberDTO.getVvTradeOrderLineEntities().size());
-
+                appTradeOrderLineResp.setTradeOrderLineIdList(tradeOrderLineIdList);
-                VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId());
                 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);
     }
 
     /***