update: 修改订单预览、提交订单相关

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java

@@ -14,6 +14,11 @@ import java.util.Map;
 @Data
 public class AppTradeOrderSettlementRespVO {
 
+
+    @Schema(description = "保存每个店铺返回页面的 订单信息汇总，key为店铺id，value为商品价格运费", requiredMode = Schema.RequiredMode.REQUIRED, example = "{1:{}},2:{}}}")
+    Map<Long,AppTradeOrderSettlementRespVO> shopRespVOMap;
+
+
     @Schema(description = "为键值对：根据店铺聚合的skuId列表，key为店铺id，value为商品skuid数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "{1:[12,23],2:[34,73]}") //key为店铺ID，value为skuid的List
     Map<Long,List<Long>> shopSkuIds;
     @Schema(description = "为键值对：商品对应的店铺id和店名，key为店铺id，value为店铺名", requiredMode = Schema.RequiredMode.REQUIRED, example = "{15:'中星直营店',23:'五行茶旗舰店'}") //key为店铺ID，value为skuid的List

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -220,6 +220,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
 //        TradePriceCalculateRespBO calculateRespBO = calculatePrice(userId, settlementReqVO);
 
         TradePriceCalculateRespBO calculateRespBO = new TradePriceCalculateRespBO();
+        calculateRespBO.setPrice(new TradePriceCalculateRespBO.Price());
         calculateRespBO.getPrice().setPayPrice(allShopPayPrice);
         calculateRespBO.getPrice().setTotalPrice(allShopItemPrice);
         calculateRespBO.getPrice().setDeliveryPrice(allShopDeliveryPrice);
@@ -232,6 +233,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         AppTradeOrderSettlementRespVO respVO = TradeOrderConvert.INSTANCE.convert(calculateRespBO, address);
 
         // add by Ben
+        respVO.setShopRespVOMap(shopRespVOMap);//保存每个店铺返回页面的 订单信息汇总
         respVO.setShopSkuIds(shopSkuIds);//把sku根据店聚合放到map中
         respVO.setShopNameMap(shopNameMap);
         respVO.setCurrentMemberPoints(memberPoints);//用户当前积分