Merge remote-tracking branch 'origin/qa' into qa

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

@@ -16,6 +16,7 @@ public enum ResponseResult {
     NOT_LOGIN("40001", "用户未登录"),
     PARAMETER_MISSING("40002", "缺少必要参数"),
     OPERATE_TOO_OFTEN("40003", "忙不过来了，请稍后再试"),
+    NOT_SUPPORTED("40004", "操作不支持"),
 
     /**
      * 用户信息状态码

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

@@ -242,6 +242,11 @@ public class ShoppingCartMCoffeeServiceImpl {
             throw new ServiceException(ResponseResult.SHOPPING_CART_UPDATE_ERROR);
         }
 
+        //商品券行商品数量不可增加
+        if (cartGoods.getCouponCode() != null && qty >1) {
+            throw new ServiceException(ResponseResult.NOT_SUPPORTED);
+        }
+
         // 检查购物车商品库存数量
 //        checkUpdateStock(partnerId, storeId, menuType, qty, cartGoods);
 
@@ -320,10 +325,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 获取用户信息
         CustomerInfoVo assortmentCustomerInfoVo = getCustomerInfoVo(shoppingCartInfoRequestVo.getSessionId());
         String userId = assortmentCustomerInfoVo.getMemberId();
-//        String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID();
-//        String unionId = assortmentCustomerInfoVo.getUnionId();
-        String thirdPartyMemberID = "test";
-        String unionId = "test";
+        String thirdPartyMemberID = assortmentCustomerInfoVo.getThirdPartyMemberID();
+        String unionId = assortmentCustomerInfoVo.getUnionId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
         String appId = shoppingCartInfoRequestVo.getAppId();