Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

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

@@ -802,8 +802,10 @@ public class OrderAdapter {
         }
 
         if (OrderChannelType.IWC.getCode().equals(channelType)) {
-            Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode()};
+            Integer[] statuses = new Integer[]{OrderStatus.COMPLETE.getCode(), OrderStatus.CALCEL.getCode(), OrderStatus.WAIT_PAY.getCode()};
             queryOrdersDto.setStatus(statuses);
+            Integer[] payWCStatus =new Integer[]{PayStatus.NOT_PAY.getCode(),PayStatus.HAVE_PAID.getCode(), PayStatus.HAVE_REFUND.getCode(), PayStatus.COMPLETE.getCode()};
+            queryOrdersDto.setPayStatus(payWCStatus);
         }
 
         if (OrderChannelType.SAASMALL.getCode().equals(channelType)) {

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

@@ -39,6 +39,11 @@ public class ShoppingCartGoodsMealResponseVo extends ShoppingCartGoodsBaseRespon
     private List<CartGoods> dinnerProducts;
 
     /**
+     * 活动信息
+     */
+    private ActivityTip activityTip;
+
+    /**
      * 购物车人员列表
      */
     private List<ShoppingCartGoodsMealCartVo> cartList;

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

 package cn.freemud.service.impl;
 
+import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.ActivityCalculationDiscountRequestDto;
 import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.UserLoginInfoDto;
+import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.dto.user.GetSessionUserInfoDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityChannelEnum;
 import cn.freemud.enums.ProductType;
 import cn.freemud.enums.ResponseResult;
+import cn.freemud.enums.ShoppingCartPromotionEnum;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.ShoppingCartNewService;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.service.thirdparty.CustomerApplicationClient;
+import cn.freemud.utils.PromotionFactory;
 import cn.freemud.utils.PropertyConvertUtil;
 import cn.freemud.utils.RedisLock;
 import cn.freemud.utils.ResponseUtil;
@@ -81,6 +86,8 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
     private TimeSalePromotionForWcService timeSalePromotionForWcService;
     @Autowired
     private CustomerApplicationClient customerApplicationClient;
+    @Autowired
+    private ActivityAdapter activityAdapter;
 
     @Override
     public BaseResponse addGoodsByCard(AddGoodsByWeixinCardRequestVo request) {
@@ -412,6 +419,13 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
         }
         // 限时特价
         timeSalePromotionForWcService.updateShoppingCartGoodsDiscount(calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo);
+
+        ActivityQueryDto activityQueryDto = activityAdapter.getActivityQueryDto(partnerId, storeId, userId, appId, orderType);
+        // 封装满减优惠规则信息
+        FullPromotionService fullPromotionService = (FullPromotionService) PromotionFactory.getPromotionService(ShoppingCartPromotionEnum.FULL_REDUCTION);
+        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVos  =new ShoppingCartGoodsResponseVo();
+        fullPromotionService.updateShoppingCartGoodsDiscount(null, activityQueryDto, null, cartGoodsList, shoppingCartGoodsResponseVos, null, null);
+        shoppingCartGoodsResponseVo.setActivityTip(shoppingCartGoodsResponseVos.getActivityTip());
     }
 
     /**