Merge branch 'KA-【华莱士】【半定制】一个订单多张优惠券使用场景-zxh-look' into qa

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ChooseCouponVo.java

@@ -25,4 +25,10 @@ public class ChooseCouponVo {
      */
     private Integer couponType;
 
+    /**
+     * fisherman 促销算价返回
+     *  优惠金额（单位分）
+     */
+    private Integer discountAmount;
+
 }

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

@@ -112,6 +112,8 @@ public class CouponPromotionService implements IPromotionService {
                 for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
                     for (CouponResults discount : calculationDiscountResult.getCouponDiscounts()){
                         if(chooseCouponVo.getCouponCode().equals(discount.getCouponCode())){
+                            // fisherman 加入券的金额
+                            chooseCouponVo.setDiscountAmount(discount.getDiscountAmount());
                             couponCodes.add(chooseCouponVo);
                             break;
                         }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java

@@ -100,6 +100,8 @@ public class CouponSharingService {
                 for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
                     for (Discount discount : couponResultsList){
                         if(chooseCouponVo.getCouponCode().equals(discount.getActivityCode())){
+                            // fisherman 加入券的金额
+                            chooseCouponVo.setDiscountAmount(discount.getDiscount());
                             couponCodes.add(chooseCouponVo);
                             break;
                         }