麦咖啡运费月卡开发

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

 package cn.freemud.service.impl.mcoffee;
 
 import cn.freemud.adapter.ActivityAdapter;
-import cn.freemud.adapter.ShoppingCartConvertAdapter;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ShoppingCartConstant;
 import cn.freemud.entities.dto.*;
@@ -979,10 +978,13 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = new ArrayList<>();
         if (StringUtils.isNotEmpty(couponCode)) {
-            ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-            coupon.setCode(couponCode);
-            coupon.setActivityCode(activityCode);
-            coupons.add(coupon);
+            List<String> codeList = Arrays.asList(couponCode.split(","));
+            for (String code: codeList) {
+                ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
+                coupon.setCode(code);
+                coupon.setActivityCode(activityCode);
+                coupons.add(coupon);
+            }
         }
 
         //购物车商品券

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

@@ -418,11 +418,8 @@ public class CalculationServiceImpl {
         shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + totalPackgeAmount);
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscount == null ? 0L : calculationDiscount.getTotalDiscountAmount());
-        if(calculationDiscount != null && calculationDiscount.getDeliveryAmount() == null){
-            shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
-            shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
-
-        }
+        shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
+        shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(calculationDiscount.getDistributionFee());
     }
 
 }