Merge branch 'feature-yu.sun-20200911' into qa

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

@@ -66,6 +66,13 @@ public class MCoffeeShoppingCartController {
         return shoppingCartMCoffeeService.getGoodsList(request);
     }
 
+
+    @ApiAnnotation(logMessage = "getCartInfoByUser")
+    @PostMapping(value = "/getCartInfoByUser")
+    public BaseResponse getCartInfoByUser(@Validated @LogParams @RequestBody QueryCartInfoRequestVo requestVo){
+        return shoppingCartMCoffeeService.getCartInfoByUser(requestVo);
+    }
+
     /**
      * 查询购物车可使用优惠券
      */

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

+package cn.freemud.entities.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotEmpty;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: QueryCartInfoRequestVo
+ * @Package cn.freemud.entities.vo
+ * @Description: 简单描述下这个类是做什么用的
+ * @author: yu.sun
+ * @date: 2020/9/11 10:35
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class QueryCartInfoRequestVo {
+    @ApiModelProperty(value = "用户Id",required = true)
+    @NotEmpty(message = "用户Id不可为空")
+    private String userId;
+    @ApiModelProperty(value = "商户Id",required = true)
+    @NotEmpty(message = "商户Id不可为空")
+    private String partnerId;
+    @ApiModelProperty(value = "门店id",required = true)
+    @NotEmpty(message = "门店id不可为空")
+    private String storeId;
+}
\ No newline at end of file

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

@@ -108,6 +108,27 @@ public class AssortmentSdkService {
     }
 
     /**
+     * 调用聚合sdk获取缓存中购物车信息
+     *
+     * @param partnerId
+     * @param storeId
+     * @param useId
+     * @return
+     */
+    public List<CartGoods> getShoppingCartForCoupon(String partnerId, String storeId, String useId, String tableNumber, ShoppingCartBaseService shoppingCartService) {
+        com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = getCartParamDto(partnerId, storeId, useId);
+        cartParamDto.setTableNumber(tableNumber);
+        // 根据不同点餐类型获取不同购物车实例
+        BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods>> baseResponse = shoppingCartService.getCartGoodsList(cartParamDto, LogThreadLocal.getTrackingNo());
+        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {
+            return new ArrayList<>();
+        }
+
+        return JSONArray.parseArray(JSONObject.toJSONString(baseResponse.getResult()), CartGoods.class);
+    }
+
+
+    /**
      * 调用聚合sdk设置缓存中购物车信息
      *
      * @param partnerId

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

@@ -19,6 +19,7 @@ import cn.freemud.service.impl.FullSubtractionActivityServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CalculationServiceImpl;
 import cn.freemud.service.impl.mcoffee.calculation.CouponDiscountCalculation;
 import cn.freemud.service.impl.mcoffee.entity.CopyShoppingCartRequestVo;
+import cn.freemud.service.impl.mcoffee.entity.CouponAvailableReq;
 import cn.freemud.service.impl.mcoffee.entity.MCoffeeAddGoodsRequestVo;
 import cn.freemud.service.impl.mcoffee.entity.SwitchShoppingCartRequestVo;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
@@ -317,6 +318,14 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
+    public BaseResponse getCartInfoByUser(QueryCartInfoRequestVo requestVo){
+        // 获取购物车商品?
+         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), "", shoppingCartBaseService);
+         List<CouponAvailableReq> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList);
+         return ResponseUtil.success(resList);
+    }
+
+
     /**
      * 查询购物车可用券
      */

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -321,6 +321,53 @@ public class CouponDiscountCalculation {
     }
 
 
+    public List<CouponAvailableReq> buildAvailableCoupons(QueryCartInfoRequestVo requestVo,List<CartGoods> cartGoods){
+        List<CouponAvailableReq> resList = new ArrayList<>();
+        CouponAvailableReq res = new CouponAvailableReq();
+        res.setProviderId(requestVo.getPartnerId());
+        res.setMerchantId(requestVo.getPartnerId());
+        res.setStoreId(requestVo.getStoreId());
+        List<String> couponList = new ArrayList<>();
+        res.setChannelIdList(commonService.getOrgCodes(requestVo.getPartnerId(), requestVo.getStoreId()));
+        List<CouponProductVo> productList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(cartGoods)) {
+            cartGoods.forEach(cartGood -> {
+                if (StringUtils.isNotEmpty(cartGood.getCouponCode())) {
+                    couponList.add(cartGood.getCouponCode());
+                    res.setCouponCodes(couponList);
+                }
+                if (CollectionUtils.isNotEmpty(cartGood.getProductComboList())) {
+                    cartGood.getProductComboList().forEach(comboxGoods -> {
+                        CouponProductVo couponProductVo = new CouponProductVo();
+                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
+                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
+                        couponProductVo.setQuantity(comboxGoods.getQty());
+                        couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCategoryCode(null);
+                        productList.add(couponProductVo);
+                    });
+                }
+                if (CollectionUtils.isNotEmpty(cartGood.getProductGroupList())) {
+                    cartGood.getProductGroupList().forEach(comboxGoods -> {
+                        CouponProductVo couponProductVo = new CouponProductVo();
+                        couponProductVo.setAmount(Integer.valueOf(comboxGoods.getAmount().toString()));
+                        couponProductVo.setKeyProductCode(comboxGoods.getCustomerCode());
+                        couponProductVo.setQuantity(comboxGoods.getQty());
+                        couponProductVo.setProductId(comboxGoods.getGoodsId());
+                        couponProductVo.setCategoryCode(null);
+                        productList.add(couponProductVo);
+                    });
+                }
+            });
+            res.setProductList(productList);
+            Long totalAmount = createProductRequest(cartGoods, productList);
+            res.setTotalAmount(Integer.valueOf(totalAmount.toString()));
+            resList.add(res);
+        }
+        return resList;
+        }
+
+
 
 
 //    public String getAppSecret(String partnerId) {