Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into qa

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

@@ -23,4 +23,6 @@ public class ActivityQueryDto {
      */
     private Integer orderType;
 
+    private ActivityQueryResponseDto activityQueryResponseDto;
+
 }

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

@@ -21,6 +21,7 @@ import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
+import cn.freemud.entities.dto.activity.ActivityQueryResponseDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductRequestDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductResponseDto;
@@ -48,6 +49,7 @@ import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmoun
 import com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse;
 import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
+import com.freemud.application.sdk.api.promotioncenter.response.ActivityResponse;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
@@ -134,6 +136,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
     @Autowired
     private ProductService productService;
+    @Autowired
+    private ActivityService activityService;
 
     /**
      * 从微信卡券向购物车中添加商品
@@ -925,7 +929,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
      * @param cartGoodsList
      * @param shoppingCartGoodsResponseVo
      */
-    private void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, UserLoginInfoDto userLoginInfoDto,String menuType,Long deliveryAmount) {
+    private void updateShoppingCartGoodsDiscount(CouponPromotionVO couponPromotionVO, ActivityQueryDto activityQueryDto, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, List<CartGoods> cartGoodsList
+            , ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, UserLoginInfoDto userLoginInfoDto,String menuType,Long deliveryAmount) {
         //默认计算优惠
         DefaultPromotionService defaultPromotionService = (DefaultPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.DEFAULT_PROMOTION);
         defaultPromotionService.updateShoppingCartGoodsDiscount(couponPromotionVO, activityQueryDto, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo, userLoginInfoDto, shoppingCartInfoRequestVo);
@@ -1025,12 +1030,39 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     shoppingCartGoodsResponseVo.setThresholdAmount(discount.get().getThresholdAmount());
                     shoppingCartGoodsResponseVo.setIsDiscountDelivery(true);
                 } else {
+
+                    List<ActivityTypeEnum> activityTypeEnums = new LinkedList<>();
+                    activityTypeEnums.add(ActivityTypeEnum.TYPE_14);
+
+                    ActivityQueryResponseDto activityQueryResponseDto = activityService.queryActivityByType(activityQueryDto, activityTypeEnums, null);
+                    if (activityQueryResponseDto != null &&activityQueryResponseDto.getResult()!=null && activityQueryResponseDto.getResult().size()>0) {
+
+                        ActivityResponseDto activityResponse = activityQueryResponseDto.getResult().get(0);
+                        BenefitBeanDto beanDto=activityResponse.getBenefits().get(0);
+
+                        if(beanDto.getDiscountAmount()>=(calculationDiscountResult.getDeliveryAmount() / 100)){
+                            String desc = DELIVERY_DISCOUNT_DESC2;
+                            shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount()));
+                        }else{
+                            String desc = DELIVERY_DISCOUNT_DESC1;
+                            shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, beanDto.getThresholdAmount(),calculationDiscountResult.getDeliveryAmount() / 100));
+                        }
+
+                        shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
+                        shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
+                        shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
+
+                    }else{
                         String desc = DELIVERY_DISCOUNT_DESC3;
                         shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, calculationDiscountResult.getDeliveryAmount() / 100));
                         shoppingCartGoodsResponseVo.setDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                         shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscountResult.getDeliveryAmount());
                         shoppingCartGoodsResponseVo.setIsDiscountDelivery(false);
                     }
+
+
+
+                }
             } else {
                 String desc = DELIVERY_DISCOUNT_DESC3;
                 shoppingCartGoodsResponseVo.setDeliveryDiscountDesc(String.format(desc, deliveryAmount / 100));