Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into master

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java
#	order-application-service/pom.xml

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1324,6 +1324,9 @@ public class OrderSdkAdapter {
             case "MEMBER_PRICE_DISCOUNT":
                 type=220;
                 break;
+            case "GATHER_SPOT":
+                type=221;
+                break;
             default:
                 break;
         }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -42,6 +42,7 @@ public enum OldOrderAccountType {
     NEW_USER_DISCOUNT(101, "新用户立减", "NEW_USER_DISCOUNT"),
     PRICE_DEDUCTION_COUPON(103, "抵价券", "PRICE_DEDUCTION_COUPON"),
     TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT"),
+    GATHER_SPOT(221, "集点活动","GATHER_SPOT"),
     MEMBER_PRICE_DISCOUNT(220, "会员价优惠", "MEMBER_PRICE_DISCOUNT");
     private Integer code;
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -39,6 +39,7 @@ public enum QueryOrderAccountType {
     ONLINE_PAY("ONLINE_PAY", "线上支付"),
     FULL_DISTRIBUTION_FEE("FULL_DISTRIBUTION_FEE", "满减配送费"),
     OFFLINE_PAY("OFFLINE_PAY", "线下支付"),
+    GATHER_SPOT("GATHER_SPOT", "集点活动"),
     MEMBER_PRICE_DISCOUNT("MEMBER_PRICE_DISCOUNT","会员价优惠"),
     MCCAFE_MONTH_CARD("MCCAFE_MONTH_CARD","麦咖啡月卡"),
     WITH_ORDER_BUY_COUPON_FEE("WITH_ORDER_BUY_COUPON_FEE", "随单买月卡"),

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2480,6 +2480,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_23.getCode().equals(activityType)){
             return OldOrderAccountType.SUPER_PURCHASE;
         }
+        if (ActivityTypeEnum.TYPE_221.getCode().equals(activityType)){
+            return OldOrderAccountType.GATHER_SPOT;
+        }
         return OldOrderAccountType.BUYM_SENDN;
     }
 

order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -54,6 +54,7 @@ public enum ActivityTypeEnum {
     TYPE_PACKAGE(900, "包装费"),
     TYPE_DELIVERY(901, "配送费"),
     TYPE_211(211, "套餐优惠"),
+    TYPE_221(221, "集点活动"),
     TYPE_320(320, "会员价优惠");
 
     private Integer code;

shopping-cart-application-service/src/main/java/cn/freemud/enums/ShoppingCartPromotionEnum.java

@@ -25,7 +25,9 @@ public enum ShoppingCartPromotionEnum {
     TwoN_DISCOUNT(9, "twoNDiscountService"),
     BUY_GIFTS(10, "buyAndGiftsPromotionService"),
     MEMBER_DISCOUNT(11, "memberDiscountService"),
-    Material(12, "MaterialPromotionService");
+    Material(12, "MaterialPromotionService"),
+    // 集点活动类
+    GATHER_SPOT(13, "gatherSpotPromotionService");
 
     private Integer type;
     private String msgType;

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

+package cn.freemud.service.impl;
+
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.UserLoginInfoDto;
+import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
+import cn.freemud.entities.dto.activity.ActivityQueryDto;
+import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.vo.*;
+import cn.freemud.enums.ActivityTypeEnum;
+import cn.freemud.service.IPromotionService;
+import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ * 集点活动
+ *
+ * @version V1.0
+ * @Title: BuyAndGiftsPromotionService
+ * @Package cn.freemud.service.impl
+ * @Description:
+ * @author: pengfei.liu
+ * @date: 2020/11/16
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Service("gatherSpotPromotionService")
+public class GatherSpotPromotionService implements IPromotionService {
+
+    /**
+     * 集点活动只有赠送的点数，没有优惠金额<br/>
+     * 优惠金额不做处理
+     * @param couponPromotionVO
+     * @param activityQueryDto
+     * @param calculationDiscountResult
+     * @param cartGoodsList
+     * @param shoppingCartGoodsResponseVo
+     * @param userLoginInfoDto
+     * @param shoppingCartInfoRequestVo
+     */
+    @Override
+    public void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto,
+                                                ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult,
+                                                List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,
+
+                                                UserLoginInfoDto userLoginInfoDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
+        return;
+    }
+
+    /**
+     * 活动类型-TYPE_221筛选出集点活动
+     * 集点活动没有优惠金额，所以促销金额设置为0
+     * @param shoppingCartGoodsResponseVo
+     * @param calculationDiscountResult
+     * @param shoppingCartGoodsDto
+     * @param premiumExchangeActivity
+     * @param shoppingCartInfoRequestVo
+     */
+    @Override
+    public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo) {
+
+        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())) {
+            return;
+        }
+
+        // 活动类型-TYPE_221筛选出集点活动
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> gatherSpots = calculationDiscountResult.getDiscounts().stream().filter(activityPrompt -> ActivityTypeEnum.TYPE_221.getCode().intValue() == activityPrompt.getType().intValue()).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(gatherSpots)) {
+            return;
+        }
+
+        // 其他活动已经计算出来的促销活动
+        List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos() == null ? new ArrayList<>() : shoppingCartGoodsDto.getActivityDiscountsDtos();
+
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount  gatherSpot : gatherSpots) {
+            //设置优惠活动
+            ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+            activityDiscountsDto.setActivityCode(gatherSpot.getActivityCode());
+            activityDiscountsDto.setActivityName(gatherSpot.getActivityName());
+            activityDiscountsDto.setActivityType(gatherSpot.getType());
+            activityDiscountsDto.setDiscountAmount(0);
+            activityDiscountsDtos.add(activityDiscountsDto);
+        }
+
+        shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos);
+    }
+
+}

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

@@ -1371,6 +1371,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         BuyAndGiftsPromotionService buyAndGiftsPromotionService = (BuyAndGiftsPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.BUY_GIFTS);
         buyAndGiftsPromotionService.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
 
+        // 集点活动
+        GatherSpotPromotionService gatherSpotPromotionService = (GatherSpotPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.GATHER_SPOT);
+        gatherSpotPromotionService.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto, premiumExchangeActivity, shoppingCartInfoRequestVo);
+
         /**
          * 设置加料商品行记录
          */