Merge branches 'feature/20200910_商品券已加入购物车提示_wuping' and 'qa' of…

Merge branches 'feature/20200910_商品券已加入购物车提示_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -85,7 +85,7 @@ public enum ResponseResult {
     SHOPPING_CART_SHOP_ID_NOT_EMPTY("44019", "门店编号不能为空"),
     SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP("44020", "券不适用于该门店"),
     SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
-    SHOPPING_CART_COUPON_USED("44021", "商品券已使用"),
+    SHOPPING_CART_COUPON_USED("44021", "优惠券已加入餐盘"),
 
     /**
      * 订单状态码

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

@@ -334,7 +334,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         String appId = shoppingCartInfoRequestVo.getAppId();
         //非商品券券号
         String couponCode = shoppingCartInfoRequestVo.getCouponCode();
-//        String menuType = shoppingCartInfoRequestVo.getMenuType();
+        String menuType = shoppingCartInfoRequestVo.getMenuType();
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();
 //        String receiveId = shoppingCartInfoRequestVo.getReceiveId();
 
@@ -344,7 +344,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_INVAILD);
         }
         // 获取购物车商品-查询用户券-券码校验可用券
-        availableCoupon = couponDiscountCalculation.availableCoupon(partnerId, storeId, userId, thirdPartyMemberID, unionId, appId, couponCode, orderType, cartGoodsList);
+        availableCoupon = couponDiscountCalculation.availableCoupon(partnerId, storeId, userId, thirdPartyMemberID, unionId, appId, couponCode, orderType, menuType,cartGoodsList);
         return ResponseUtil.success(availableCoupon);
     }
 

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

@@ -8,23 +8,19 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
-import cn.freemud.redis.RedisCache;
 import cn.freemud.service.CommonService;
 import cn.freemud.service.impl.mcoffee.entity.CouponAvailableReq;
 import cn.freemud.service.impl.mcoffee.entity.CouponAvailableResp;
 import cn.freemud.service.impl.mcoffee.entity.CouponProductVo;
 import cn.freemud.service.impl.mcoffee.entity.CouponState;
-import cn.freemud.service.thirdparty.CardBinClient;
 import cn.freemud.service.thirdparty.CouponClient;
 import cn.freemud.service.thirdparty.CustomerExtendClient;
 import cn.freemud.utils.BarcodeUtil;
 import cn.freemud.utils.LogUtil;
 import com.alibaba.fastjson.JSON;
-import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 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;
@@ -70,6 +66,10 @@ public class CouponDiscountCalculation {
     private String appid;
 
 
+    private static final String mcafe = "mccafe";
+
+    private static final String mcafePickup ="mccafe_pickup";
+
     /**
      * 优惠计算
      */
@@ -203,7 +203,7 @@ 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) {
+            ,  String couponCode, Integer orderType,String menuType,List<CartGoods> cartGoods) {
 
 //        List<CartGoods> tmpCartGoods = cartGoods.parallelStream().filter(k -> StringUtils.isBlank(k.getCouponCode())).collect(Collectors.toList());
         boolean hasGoodsCoupon = false;
@@ -214,8 +214,11 @@ public class CouponDiscountCalculation {
         getMemberCouponListRequestDto.setAppId(appId);
         getMemberCouponListRequestDto.setThirdPartyMemberId(thirdPartyMemberId);
         getMemberCouponListRequestDto.setUnionId(unionId);
-        //麦咖啡固定值
-        getMemberCouponListRequestDto.setTag("mccafe");
+        String tag = mcafe;
+        if("saas".equals(menuType)){
+            tag = mcafePickup;
+        }
+        getMemberCouponListRequestDto.setTag(tag);
         getMemberCouponListRequestDto.setPageNum(1);
         getMemberCouponListRequestDto.setPageSize(Integer.MAX_VALUE);
         GetMemberCouponListResponseDto.Result result = getMemberCouponList(getMemberCouponListRequestDto);