Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java

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

@@ -201,7 +201,7 @@ public class DeliveryAdapter {
                         ProductInfo deliveryComboProductInfo = new ProductInfo();
                         deliveryComboProductInfo.setProductCode(comboProduct.getProductId());
                         deliveryComboProductInfo.setProductName(comboProduct.getProductName());
-                        deliveryComboProductInfo.setProductNumber(comboProduct.getNumber());
+                        deliveryComboProductInfo.setProductNumber(comboProduct.getNumber()/productList.getNumber());
                         deliveryComboProductInfo.setProductPrice(comboProduct.getSalePrice().intValue());
                         //餐道使用
                         deliveryComboProductInfo.setCumulatedTotal(comboProduct.getNumber() * comboProduct.getSalePrice().intValue());

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

@@ -306,16 +306,16 @@ public class ShoppingCartMCoffeeServiceImpl {
         String receiveId = shoppingCartInfoRequestVo.getReceiveId();
 
 
-        /**
-         * 如果couponCode为空，则从缓存里尝试获取
-         * 如果couponCode不为空，则设置到缓存里
-         */
-        if(StringUtils.isEmpty(couponCode)) {
-            couponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService);
-            //TODO 校验券是否可用，不可用要删除
-        } else {
-            assortmentSdkService.setShoppingCartCouponCode(partnerId, storeId, userId, couponCode, shoppingCartBaseService);
-        }
+//        /**
+//         * 如果couponCode为空，则从缓存里尝试获取
+//         * 如果couponCode不为空，则设置到缓存里
+//         */
+//        if(StringUtils.isEmpty(couponCode)) {
+//            couponCode = assortmentSdkService.getShoppingCartCoupon(partnerId, storeId, userId, shoppingCartBaseService);
+//            //TODO 校验券是否可用，不可用要删除
+//        } else {
+//            assortmentSdkService.setShoppingCartCouponCode(partnerId, storeId, userId, couponCode, shoppingCartBaseService);
+//        }
 
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);