sunyu::update::merge branch to master from new function about getCartInfoByUser

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

@@ -389,30 +389,6 @@ 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);
-        }
-
-        //如果用户购物车中已有券，则将券放进购物车中
-        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);
@@ -452,26 +428,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         return ResponseUtil.success(resList);
     }
 
-
-//    /**
-//     * 券码用-查询购物车最新信息，计算优惠
-//     * @param requestVo
-//     * @return
-//     */
-//    public BaseResponse getCartInfoByUser(QueryCartInfoRequestVo requestVo){
-//        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = new ShoppingCartGoodsResponseVo();
-//        // 获取购物车商品?
-//         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), "", shoppingCartBaseService);
-//        // 当couponCode不为空时，需参与价格计算
-//        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(null, null, cartGoodsList);
-//        // 促销活动的优惠金额计算
-//        calculationService.updateShoppingCartGoodsDiscount(requestVo.getPartnerId(), requestVo.getStoreId(), requestVo.getUserId(), requestVo.getAppId(), requestVo.getOrderType(), requestVo.isMemberPaid(), requestVo.getMenuType(), requestVo.getReceiveId(), null,
-//                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo);
-//         List<CouponAvailableReq> resList = couponDiscountCalculation.buildAvailableCoupons(requestVo,cartGoodsList);
-//         return ResponseUtil.success(resList);
-//    }
-
-
     /**
      * 查询购物车可用券
      */