Merge remote-tracking branch 'origin/master'

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/GetMemberInfoResponseVo.java

@@ -3,6 +3,7 @@ package cn.freemud.entities.dto;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -63,6 +64,11 @@ public class GetMemberInfoResponseVo {
          */
         private Integer discountAmount;
 
+        /**（千分比）
+         *  6.5代表的是6.5折
+         */
+        private BigDecimal discount;
+
         /**
          * 状态：-1:未激活 0:可用(剔除过期) 1:已使用 2:部分使用 3:取消 6:已过期(根据生失效日期) 99：未知（目前暂不支持）
          */

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

@@ -1184,7 +1184,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 List<GetMemberCouponListResponseDto.Result.MemberCoupon> memberCoupons = result.getMemberCoupons();
                 Date nowDate = new Date();
                 memberCoupons = memberCoupons.stream().filter(item -> filterExpireCoupon(nowDate, item.getEndTime())).collect(Collectors.toList());//过滤掉过期的券
-                coupons = memberCoupons.stream().map(each -> convert2MemberCoupon(each)).collect(toList());
+                coupons = memberCoupons.stream().map(this::convert2MemberCoupon).collect(toList());
             }
             responseData.setCoupons(coupons);
             // 积分
@@ -1203,12 +1203,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         } else {
             // 优惠券
-            List<CartGoods> cartGoodsList = orderItemList.stream().map(each -> convert2ShopCartGoods(each)).collect(toList());
+            List<CartGoods> cartGoodsList = orderItemList.stream().map(this::convert2ShopCartGoods).collect(toList());
 
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList, partnerId
                     , memberId, request.getStoreId(), new CouponPromotionVO(), false, request.getOrderType(), 0, "", "", "");
-            if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())) {
-                List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(each -> convert2MemberCoupon(each)).collect(toList());
+//            if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())) {
+//                List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(each -> convert2MemberCoupon(each)).collect(toList());
+//                    , memberId, request.getStoreId(), new CouponPromotionVO(), false, request.getOrderType(), 0,"","", "");
+            if (activityClassifyCouponBean != null && CollectionUtils.isNotEmpty(activityClassifyCouponBean.getUsableCoupons())){
+                List<GetMemberInfoResponseVo.Coupon> coupons = activityClassifyCouponBean.getUsableCoupons().stream().map(this::convert2MemberCoupon).collect(toList());
                 responseData.setCoupons(coupons);
             }
 
@@ -1286,7 +1289,20 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         coupon.setCuoponType(each.getCouponType());
         coupon.setCouponName(each.getCouponName());
-        coupon.setDiscountAmount(Integer.valueOf(each.getDiscountAmount()));
+        // 折扣券使用折扣字段
+        if(Objects.equals(each.getCouponType(),CouponTypeEnum.TYPE_3.getCode())){
+            int discountAmount = Integer.parseInt(Optional.ofNullable(each.getDiscountAmount()).orElse("0"));
+            BigDecimal discount = BigDecimal.ZERO;
+            // 转换千分比为小数
+            if (discountAmount != 0){
+                discount = new BigDecimal(discountAmount).divide(BigDecimal.valueOf(100),1,BigDecimal.ROUND_DOWN);
+            }
+            coupon.setDiscount(discount);
+            coupon.setDiscountAmount(0);
+        }else {
+            coupon.setDiscount(BigDecimal.ZERO);
+            coupon.setDiscountAmount(Integer.valueOf(each.getDiscountAmount()));
+        }
         coupon.setCouponLimit(null);
         coupon.setCouponCode(each.getCouponCode());
         return coupon;