Merge branch 'feature/20210430-添加两个字段-lcf'

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -170,6 +170,18 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private List<chooseGood> chooseGoods;
 
+
+    /**
+     * 购物车商品总价
+     */
+    private Long shoppingCartGoodsAmount;
+
+    /**
+     * 加价购商品总价
+     */
+    private Long sendGoodsAmount;
+
+
     @Data
     public static class chooseGood {
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -742,6 +742,34 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
 
         }
+        // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
+        shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
+        if (CollectionUtils.isNotEmpty(shoppingCartGoodsResponseVo.getProducts())){
+            long shoppincCartGoodsAmount = shoppingCartGoodsResponseVo.getProducts().stream().mapToLong(CartGoods::getAmount).sum();
+            shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(shoppincCartGoodsAmount);
+        }
+
+        if (CollectionUtils.isNotEmpty(shoppingCartInfoRequestVo.getSendGoods())){
+            PremiumExchangeRequestVo request = new PremiumExchangeRequestVo();
+            request.setPartnerId(shoppingCartInfoRequestVo.getPartnerId());
+            request.setActivityCode(shoppingCartInfoRequestVo.getActivityCode());
+            request.setCouponCode(shoppingCartInfoRequestVo.getCouponCode());
+            request.setMenuType(shoppingCartInfoRequestVo.getMenuType());
+            request.setOrderType(shoppingCartInfoRequestVo.getOrderType());
+            request.setSessionId(shoppingCartInfoRequestVo.getSessionId());
+            request.setShopId(shoppingCartInfoRequestVo.getShopId());
+            request.setVersion(shoppingCartInfoRequestVo.getVersion());
+            BaseResponse<PremiumExchangeResponseVo> premiumExchangeResponseVoBaseResponse = premiumExchange(request);
+            if (premiumExchangeResponseVoBaseResponse != null && ResponseResult.SUCCESS.getCode().equals(premiumExchangeResponseVoBaseResponse.getCode())
+            && premiumExchangeResponseVoBaseResponse.getResult() != null && CollectionUtils.isNotEmpty(premiumExchangeResponseVoBaseResponse.getResult().getProducts())){
+                List<PremiumExchangeResponseVo.PremiumExchangeProduct> products = premiumExchangeResponseVoBaseResponse.getResult().getProducts();
+                List<String> sendGoodsIdList = shoppingCartInfoRequestVo.getSendGoods().stream().map(p -> p.getGoodsId()).collect(toList());
+                List<PremiumExchangeResponseVo.PremiumExchangeProduct> chooseSendGoodList = products.stream().filter(p -> sendGoodsIdList.contains(p.getSkuId()) || sendGoodsIdList.contains(p.getSpuId())).collect(toList());
+                long sendGoodsAmount = chooseSendGoodList.stream().mapToLong(PremiumExchangeResponseVo.PremiumExchangeProduct::getNowPrice).sum();
+                shoppingCartGoodsResponseVo.setSendGoodsAmount(sendGoodsAmount);
+            }
+        }
+        // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
 
         ApiLog.info("校验入参券是否可用",shoppingCartGoodsResponseVo,shoppingCartInfoRequestVo.getCouponCode());
         // 校验入参券是否可用