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/adapter/ShoppingCartConvertAdapter.java

@@ -92,7 +92,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
         cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
         cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
-        cartGoodsDetailDto.setTotalDiscountAmount(0);
+//        cartGoodsDetailDto.setTotalDiscountAmount(0);
         cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());
         cartGoodsDetailDto.setQty(cartGoods.getQty());

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -303,6 +303,8 @@ public class ActivityCalculationDiscountResponseDto {
             private Integer discountAmount;
 
             private Integer activityType;
+
+            private String activityName;
         }
 
         @Data

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

@@ -204,7 +204,7 @@ public class CalculationServiceImpl {
             if (discountType != null && discountAmount > 0) {
                 ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                 activityDiscountsDto.setActivityCode(discount.getCouponCode());
-                activityDiscountsDto.setActivityName(discount.getCouponCode());
+                activityDiscountsDto.setActivityName(discount.getActivityName());
                 activityDiscountsDto.setActivityType(discountType);
                 activityDiscountsDto.setDiscountAmount(0 - discountAmount);
                 activityDiscountsDtos.add(activityDiscountsDto);

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

@@ -153,7 +153,7 @@ public class CouponDiscountCalculation {
                     if(couponDiscount.getCouponCode().equals(cartGoods.getCouponCode())){
                         ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
                         activityDiscountsDto.setActivityCode(couponDiscount.getCouponCode());
-                        activityDiscountsDto.setActivityName(couponDiscount.getCouponCode());
+                        activityDiscountsDto.setActivityName(couponDiscount.getActivityName());
                         activityDiscountsDto.setActivityType(couponDiscount.getActivityType());
                         activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscountAmount());
                         productActivityDiscountsDtos.add(activityDiscountsDto);
@@ -205,8 +205,8 @@ public class CouponDiscountCalculation {
     public ActivityClassifyCouponBean availableCoupon( String partnerId, String storeId,String userId,String thirdPartyMemberId,String unionId,String appId
             ,  String couponCode, Integer orderType,List<CartGoods> cartGoods) {
 
-        List<CartGoods> tmpCartGoods = cartGoods.parallelStream().filter(k -> k.getCartGoodsUid().startsWith(CommonsConstant.COUPON_PREFIX)).collect(Collectors.toList());
-        boolean hasGoodsCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
+//        List<CartGoods> tmpCartGoods = cartGoods.parallelStream().filter(k -> StringUtils.isBlank(k.getCouponCode())).collect(Collectors.toList());
+        boolean hasGoodsCoupon = false;
 
         // 获取会员服务的优惠券列表
         GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(partnerId, userId);
@@ -356,6 +356,10 @@ public class CouponDiscountCalculation {
             if (StringUtils.isEmpty(cartGood.getSkuId()) && StringUtils.isEmpty(cartGood.getSpuId())) {
                 continue;
             }
+            // 剔除商品券得商品,麦咖啡逻辑
+            if(StringUtils.isNotEmpty(cartGood.getCouponCode())){
+                continue;
+            }
             CouponProductVo product = new CouponProductVo();
             product.setKeyProductCode(cartGood.getCustomerCode());
             product.setProductId(StringUtils.isEmpty(cartGood.getSkuId()) ? cartGood.getSpuId() : cartGood.getSkuId());

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

@@ -54,13 +54,23 @@ public class SetMealCalculation {
                 .collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods::getGoodsId, Function.identity(), (k1, k2) -> k1));
 
         // 设置商品原价与商品现价的初始值
-        for (CartGoods cartGoods : setMealProducts) {
-            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
+        for (CartGoods cartGoods : cartGoodsList) {
+            if(!ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType())){
+                continue;
+            }
+//            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
             cartGoods.setPackPrice(cartGoods.getPackPrice() * cartGoods.getQty());
             // 可选商品现总价
             long productGroupAmount = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
             productGroupTotalAmount += productGroupAmount * cartGoods.getQty();
 
+            // 固定商品现总价
+            long productComboAmount = cartGoods.getProductComboList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
+            long productComboTotalAmount = productComboAmount * cartGoods.getQty();
+
+            cartGoods.setOriginalAmount(productGroupTotalAmount + productComboTotalAmount);
+            cartGoods.setOriginalPrice(productGroupTotalAmount + productComboTotalAmount);
+
             // 套餐（固定商品）现价
             String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);
             if (StringUtils.isNotEmpty(toastMsg)) {
@@ -69,13 +79,13 @@ public class SetMealCalculation {
 
         }
 
-        long totalFinalPrice = setMealProducts.stream().mapToLong(product -> product.getFinalPrice() * product.getQty()).sum();
-        long totalOriginalPrice = setMealProducts.stream().mapToLong(product -> product.getOriginalPrice() * product.getQty()).sum();
+//        long totalFinalPrice = setMealProducts.stream().mapToLong(product -> product.getFinalPrice() * product.getQty()).sum();
+//        long totalOriginalPrice = setMealProducts.stream().mapToLong(product -> product.getOriginalPrice() * product.getQty()).sum();
 
         //总原价=促销优惠 - 套餐finalPrice + 套餐原价
 //        shoppingCartGoodsResponseVo.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount() - totalFinalPrice + totalOriginalPrice);
         //总现价=促销现总价 + 可选商品现总价
-//        shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + productGroupTotalAmount);
+        shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + productGroupTotalAmount);
         //总优惠=促销总优惠 + (套餐总原件 - 套餐总finalPrice - 可选商品总售价)
 //        shoppingCartGoodsResponseVo.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount() + totalOriginalPrice - totalFinalPrice - productGroupTotalAmount);
     }