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

shopping-cart-application-service/src/main/java/cn/freemud/demo/controller/ShoppingCartDemoController.java

@@ -64,6 +64,8 @@ import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
+import static java.util.stream.Collectors.toList;
+
 @RestController
 @RequestMapping(value = "/shoppingCart/demo", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
 @Api(value = "购物车 controller", tags = {"购物车管理接口"})
@@ -183,6 +185,36 @@ public class ShoppingCartDemoController {
         ListCartGoodsBO listCartGoodsBO = listCartGoodsBOAdapter.convert2ListCartGoodsBO(bizType.getCode(), baseRequestDTO);
         ShoppingCartGoodsBO addGoodsResponseBO = listCartGoodsServiceInstance.listCartGoods(listCartGoodsBO);
         BaseListCartGoodsVO baseListCartGoodsVO = listCartGoodsVOAdapter.convert2ListCartGoodsVO(bizType.getCode(), addGoodsResponseBO);
+
+        // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
+        baseListCartGoodsVO.setShoppingCartGoodsAmount(0L);
+        if (CollectionUtils.isNotEmpty(baseListCartGoodsVO.getProducts())){
+            long shoppincCartGoodsAmount = baseListCartGoodsVO.getProducts().stream().mapToLong(CartGoods::getAmount).sum();
+            baseListCartGoodsVO.setShoppingCartGoodsAmount(shoppincCartGoodsAmount);
+        }
+
+        if (CollectionUtils.isNotEmpty(listCartGoodsBO.getSendGoods())){
+            PremiumExchangeRequestVo premiumRequest = new PremiumExchangeRequestVo();
+            premiumRequest.setPartnerId(listCartGoodsBO.getPartnerId());
+            premiumRequest.setActivityCode(listCartGoodsBO.getActivityCode());
+            premiumRequest.setCouponCode(listCartGoodsBO.getCouponCode());
+            premiumRequest.setMenuType(listCartGoodsBO.getMenuType());
+            premiumRequest.setOrderType(listCartGoodsBO.getOrderType());
+            premiumRequest.setSessionId(listCartGoodsBO.getSessionId());
+            premiumRequest.setShopId(listCartGoodsBO.getShopId());
+            premiumRequest.setVersion(listCartGoodsBO.getVersion());
+            BaseResponse<PremiumExchangeResponseVo> premiumExchangeResponseVoBaseResponse = SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).premiumExchange(premiumRequest);
+            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 = listCartGoodsBO.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();
+                baseListCartGoodsVO.setSendGoodsAmount(sendGoodsAmount);
+            }
+        }
+        // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
+
         return ResponseUtil.success(baseListCartGoodsVO);
 
     }

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/BaseBo.java

@@ -18,6 +18,9 @@ public class BaseBo {
     /**
      * 业务类型： 0 : 自提 1：外卖 2：微商城
      */
-    private String menuType ;
+    private String menuType;
+
+    private String version;
+
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/dto/goods/add/list/BaseListCartGoodsVO.java

@@ -48,6 +48,10 @@ public class BaseListCartGoodsVO {
     private String categoryName;
 
     /**
+     * 商品额外的属性
+     */
+    List<CartGoods> products;
+    /**
      * 套餐固定商品
      */
     private List<ComboxGoodsRequestVo> productComboList;
@@ -127,5 +131,15 @@ public class BaseListCartGoodsVO {
      * svc卡支付描述
      */
     private String svcDiscountDesc;
+    /**
+     * 购物车商品总价
+     */
+    private Long shoppingCartGoodsAmount;
+
+    /**
+     * 加价购商品总价
+     */
+    private Long sendGoodsAmount;
+
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/dto/goods/add/list/PlatformListCartGoodsVO.java

@@ -24,11 +24,6 @@ public class PlatformListCartGoodsVO extends BaseListCartGoodsVO {
     private Boolean changed;
     private String uid;
 
-
-    /**
-     * 商品额外的属性
-     */
-    List<CartGoods> products;
     /**
      * 商品总数
      */