Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of…

Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

+package cn.freemud.controller;
+
+import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.*;
+import cn.freemud.service.impl.mcoffee.ShoppingCartMCoffeeServiceImpl;
+import com.freemud.application.sdk.api.log.ApiAnnotation;
+import com.freemud.application.sdk.api.log.LogParams;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: MCoffeeShoppingCartController
+ * @Package cn.freemud.controller
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/7/21 17:37
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@RestController
+@RequestMapping(value = "/shoppingCart/MCoffee", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+@Api(value = "购物车 controller", tags = {"购物车管理接口"})
+@Slf4j
+public class MCoffeeShoppingCartController {
+
+    @Autowired
+    private ShoppingCartMCoffeeServiceImpl shoppingCartMCoffeeService;
+
+    /**
+     * 向购物车中添加商品
+     */
+    @ApiAnnotation(logMessage = "addGoods")
+    @PostMapping(value = "/addGoods")
+    public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
+        return shoppingCartMCoffeeService.addGoods(request);
+    }
+
+    /**
+     * 修改购物车中商品数量
+     */
+    @ApiAnnotation(logMessage = "updateGoodsQty")
+    @PostMapping(value = "/updateGoodsQty")
+    public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
+        return shoppingCartMCoffeeService.updateGoodsQty(request);
+    }
+
+    /**
+     * 查询购物车信息
+     */
+    @ApiAnnotation(logMessage = "listCartGoods")
+    @PostMapping(value = "/listCartGoods")
+    public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
+        return shoppingCartMCoffeeService.getGoodsList(request);
+    }
+
+    /**
+     * 清空购物车
+     */
+    @ApiAnnotation(logMessage = "clearCartGoods")
+    @PostMapping(value = "/clearCartGoods")
+    public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
+        return shoppingCartMCoffeeService.clear(request);
+    }
+
+
+}

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

@@ -32,7 +32,7 @@ public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
     private String cartGoodsUid;
 
     /**
-     * 商品数量
+     * 更新后商品数量
      */
     @NotNull(message = "qty不能为空")
     private Integer qty;

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

+package cn.freemud.service.impl.mcoffee.calculation;
+
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.CheckSpqInfoResponseDto;
+import cn.freemud.entities.vo.ActivityClassifyCouponBean;
+import cn.freemud.entities.vo.CartGoods;
+import cn.freemud.entities.vo.CouponPromotionVO;
+import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+import cn.freemud.enums.CouponFlag;
+import cn.freemud.service.CouponService;
+import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
+import com.google.common.collect.Lists;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CouponDiscountCalculation
+ * @Package cn.freemud.service.impl.mcoffee
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/8/3 16:02
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Service
+public class CouponDiscountCalculation {
+
+    @Autowired
+    private CouponService couponService;
+
+
+
+    public void updateShoppingCartGoodsDiscountCoupon(CouponPromotionVO couponPromotionVO, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
+        // 用户选择了查询优惠券信息
+        if (couponPromotionVO != null && ObjectUtils.equals(CouponFlag.YES.getCode(), couponPromotionVO.getFlg())) {
+            List<CartGoods> tmpCartGoods = cartGoodsList.parallelStream().filter(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)).collect(Collectors.toList());
+            // 是否存在商品券
+            boolean hasGoodssCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
+            // 构建可用不可用优惠券
+            ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList, couponPromotionVO.getPartnerId()
+                    , couponPromotionVO.getUserId(), couponPromotionVO.getStoreId(), couponPromotionVO.getCouponCode(), hasGoodssCoupon, couponPromotionVO.getOrderType());
+            if (Objects.equals(activityClassifyCouponBean, null)) {
+                // 构建一个空得订单券信息
+                activityClassifyCouponBean = new ActivityClassifyCouponBean();
+                activityClassifyCouponBean.setCouponNum(0);
+                activityClassifyCouponBean.setDisableCouponNum(0);
+                activityClassifyCouponBean.setUsableCouponNum(0);
+                activityClassifyCouponBean.setDisableCoupons(Lists.newArrayList());
+                activityClassifyCouponBean.setUsableCoupons(Lists.newArrayList());
+            }
+            shoppingCartGoodsResponseVo.setAvailableCoupon(activityClassifyCouponBean);
+        }
+
+        // 当couponCode不为空时，需计算优惠价格
+        long couponDiscount = 0;
+        if (couponPromotionVO != null && StringUtils.isNotEmpty(couponPromotionVO.getCouponCode())
+                && calculationDiscountResult != null) {
+            List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
+            if (CollectionUtils.isNotEmpty(couponResultsList)) {
+                for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
+                    couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
+                }
+            }
+        }
+        shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
+        //循环购物车商品券
+        for (CartGoods cartGoods : cartGoodsList) {
+            if (cartGoods.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)) {
+                String spqId = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
+                // 计算优惠信息时，已将券校验过，放在map中
+                Map<String, CheckSpqInfoResponseDto> validCouponMap = calculationDiscountResult == null ? new HashMap<>() : calculationDiscountResult.getValidCouponMap();
+                if (MapUtils.isNotEmpty(validCouponMap)) {
+                    CheckSpqInfoResponseDto checkSpqInfoResponseDto = validCouponMap.get(spqId);
+                    if (checkSpqInfoResponseDto != null) {
+                        cartGoods.setOriginalPrice(checkSpqInfoResponseDto.getPrice());
+                        cartGoods.setSpuId(checkSpqInfoResponseDto.getSpuId());
+                        cartGoods.setSkuId(StringUtils.isEmpty(checkSpqInfoResponseDto.getSkuId()) ? checkSpqInfoResponseDto.getSpuId() : checkSpqInfoResponseDto.getSkuId());
+                        cartGoods.setQty(1);
+                        cartGoods.setCouponCode(checkSpqInfoResponseDto.getCouponCode());
+                        cartGoods.setSpuName(checkSpqInfoResponseDto.getSpuName());
+                    }
+                }
+            }
+        }
+
+    }
+
+
+}

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

+package cn.freemud.service.impl.mcoffee.calculation;
+
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.vo.CartGoods;
+import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
+import cn.freemud.enums.ActivityTypeEnum;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: TimeSaleCalculation
+ * @Package cn.freemud.service.impl.mcoffee
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2020/8/3 16:07
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+@Service
+public class TimeSaleCalculation {
+
+
+    /**
+     * 限时特价
+     *
+     * @return
+     */
+    public void TimeSaleUpdateShoppingCartGoodsDiscount(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo) {
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
+                || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_2.getCode().equals(discount.getType()) || (ActivityTypeEnum.TYPE_21.getCode().equals(discount.getType()))))) {
+            return;
+        }
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsList = calculationDiscountResult.getGoods();
+        if (CollectionUtils.isEmpty(goodsList)) {
+            return;
+        }
+        String toastMsg = null;
+        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> goodsMap = goodsList.parallelStream()
+                .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
+        // 存储当前享受限时特价折扣的商品数量，key:goodsId; value:可享受数量
+        Map<String, Integer> numberMap = new HashMap<>();
+        List<Integer> discounts = Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode());
+        for (CartGoods cartGoods : cartGoodsList) {
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods goods;
+            if ((goods = goodsMap.get(cartGoods.getGoodsId())) == null) {
+                continue;
+            }
+            ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = getGoodsDiscount(goods.getDiscounts(), discounts);
+            if (goodsDiscount == null) {
+                continue;
+            }
+            // 享受限时特价折扣的商品数量
+            Integer specialActualGoodsNumber = null;
+            // 商品现价
+            Long goodsNowPrice = cartGoods.getOriginalPrice() - goodsDiscount.getDiscount() / goodsDiscount.getActualGoodsNumber();
+            // numberMap用于暂存当前商品行可享受限时特价折扣的商品数量
+            if ((specialActualGoodsNumber = numberMap.get(goods.getGoodsId())) == null) {
+                numberMap.put(goods.getGoodsId(), specialActualGoodsNumber = goodsDiscount.getActualGoodsNumber());
+            }
+            //若可享受数量>=当前商品行的商品数量
+            if (specialActualGoodsNumber - cartGoods.getQty() >= 0) {
+                cartGoods.setAmount(goodsNowPrice * cartGoods.getQty());
+            } else {
+                //总价=可享受数量*优惠后单价+（当前商品行的商品数量-可享受数量）*商品原价
+                cartGoods.setAmount(specialActualGoodsNumber > 0 ? specialActualGoodsNumber * goodsNowPrice + (cartGoods.getQty() - specialActualGoodsNumber) * cartGoods.getOriginalPrice()
+                        : goods.getOriginalPrice() * cartGoods.getQty());
+                if (StringUtils.isEmpty(toastMsg)) {
+                    toastMsg = "该商品限" + goodsDiscount.getActualGoodsNumber() + "份优惠 超出按照原价计算哦";
+                }
+            }
+            numberMap.put(goods.getGoodsId(), specialActualGoodsNumber - cartGoods.getQty());
+        }
+        if (StringUtils.isNotBlank(toastMsg)) {
+            shoppingCartGoodsResponseVo.setToastMsg(toastMsg);
+        }
+    }
+
+
+
+    /**
+     * 获取指定促销类型的GoodsDiscount
+     *
+     * @param goodsDiscountList
+     * @param discounts
+     * @return
+     */
+    private ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount getGoodsDiscount(List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> goodsDiscountList, List<Integer> discounts) {
+        if (CollectionUtils.isEmpty(goodsDiscountList)) {
+            return null;
+        }
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount : goodsDiscountList) {
+            if (discounts.contains(goodsDiscount.getType())) {
+                return goodsDiscount;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 获取指定促销类型的ApportionDetails
+     *
+     * @param apportionDetailsList
+     * @param type
+     * @return
+     */
+    private ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails getApportionDetails(List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails> apportionDetailsList, ActivityTypeEnum type) {
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.ApportionGoods.ApportionDetails apportionDetails : apportionDetailsList) {
+            if (Objects.equals(apportionDetails.getActivityType(), ActivityTypeEnum.TYPE_2.getCode())) {
+                return apportionDetails;
+            }
+        }
+        return null;
+    }
+
+
+
+}

shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java

@@ -46,4 +46,14 @@ public interface ActivityClient {
      */
     @PostMapping("/activity/stock/cancelStock")
     ActivityBaseResponseDto cancelStock(ActivityCancelStockRequestDto activityCancelStockRequestDto);
+
+
+
+    /**
+     * 新版优惠均摊计算
+     * @param activityCalculationDiscountRequestDto
+     * @return
+     */
+    @PostMapping("/calculation/discount/sharing")
+    ActivityCalculationDiscountResponseDto calculationDiscountSharing(ActivityCalculationDiscountRequestDto activityCalculationDiscountRequestDto);
 }