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

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

@@ -389,6 +389,18 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 当couponCode不为空时，需参与价格计算
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,shoppingCartInfoRequestVo.getFreightCouponCode());
 
+        //如果用户购物车中已有券，则将券放进购物车中
+        String moneyCoupon = assortmentSdkService.getShoppingCartCoupon(partnerId,
+                storeId, userId, shoppingCartBaseService,SaveCouponType.COUPON.getCode());
+        String deliveryFeeCoupon = assortmentSdkService.getShoppingCartCoupon(partnerId,storeId,
+                userId,shoppingCartBaseService,SaveCouponType.FREIGHT_COUPON.getCode());
+        if (StringUtils.isNotEmpty(deliveryFeeCoupon)){
+            shoppingCartGoodsResponseVo.setFreightCouponCode(deliveryFeeCoupon);
+        }
+        if (StringUtils.isNotEmpty(moneyCoupon)){
+            shoppingCartGoodsResponseVo.setCouponCode(moneyCoupon);
+        }
+
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);