fix

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

@@ -49,7 +49,13 @@ public class CouponPromotionService implements IPromotionService {
             List<CartGoods> tmpCartGoods = cartGoodsList.parallelStream().filter(k -> k.getCartGoodsUid()
                     .startsWith(CommonsConstant.COUPON_PREFIX)).collect(Collectors.toList());
             // 是否存在商品券
+            String chooseCouponCode = "";
             boolean hasGoodssCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
+            if (StringUtils.isBlank(couponPromotionVO.getUnChooseCouponCode()) && hasGoodssCoupon){
+                chooseCouponCode = tmpCartGoods.get(0).getGoodsId().substring(CommonsConstant.COUPON_PREFIX.length());
+            } else {
+                chooseCouponCode = couponPromotionVO.getUnChooseCouponCode();
+            }
             // 构建可用不可用优惠券
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList,
                     couponPromotionVO.getPartnerId(),
@@ -59,7 +65,7 @@ public class CouponPromotionService implements IPromotionService {
                     hasGoodssCoupon,
                     couponPromotionVO.getOrderType(),
                     0,
-                    shoppingCartInfoRequestVo.getAppId(),shoppingCartInfoRequestVo.getMenuType(), couponPromotionVO.getUnChooseCouponCode() );
+                    shoppingCartInfoRequestVo.getAppId(),shoppingCartInfoRequestVo.getMenuType(), chooseCouponCode);
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息
                 activityClassifyCouponBean = createEmptyActivityCouponBean();

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

@@ -423,7 +423,7 @@ public class CouponServiceImpl implements CouponService {
             , boolean hasGoodsCoupon
             , Integer orderType
             , int isNew
-            , String appId,String menuType, String unChooseCouponCode) {
+            , String appId,String menuType, String chooseCouponCode) {
         GetMemberCouponListRequestDto getMemberCouponListRequestDto = new GetMemberCouponListRequestDto(partnerId, userId);
         getMemberCouponListRequestDto.setStatusFlags(Arrays.asList(CouponStatus.STATUS_0.getCode()));
         getMemberCouponListRequestDto.setPageNum(1);
@@ -461,7 +461,7 @@ public class CouponServiceImpl implements CouponService {
         });
         List<CouponStateVo> couponStateList = buildAvailiableCoupons(cartGoods, partnerId, storeId, couponCodes, isNew,appId,menuType);
         if (CollectionUtils.isNotEmpty(couponStateList)) {
-            return returnSuccessAvailiableCoupons(couponCode, hasGoodsCoupon, availableCouponResponseVo, usableCoupons, disableCoupons, memberCouponMap, couponStateList, unChooseCouponCode);
+            return returnSuccessAvailiableCoupons(couponCode, hasGoodsCoupon, availableCouponResponseVo, usableCoupons, disableCoupons, memberCouponMap, couponStateList, chooseCouponCode);
         }
         return null;
     }
@@ -517,7 +517,7 @@ public class CouponServiceImpl implements CouponService {
 
     private ActivityClassifyCouponBean returnSuccessAvailiableCoupons(String couponCode, boolean hasGoodsCoupon, ActivityClassifyCouponBean availableCouponResponseVo, List<ActivityCouponBean> usableCoupons,
                                                                       List<ActivityCouponBean> disableCoupons, Map<String, GetMemberCouponListResponseDto.Result.MemberCoupon> memberCouponMap,
-                                                                      List<CouponStateVo> couponStateList, String unChooseCouponCode) {
+                                                                      List<CouponStateVo> couponStateList, String chooseCouponCode) {
         int disableCouponNum = 0;
         int usableCouponNum = 0;
         for (CouponStateVo couponStateVo : couponStateList) {
@@ -579,7 +579,7 @@ public class CouponServiceImpl implements CouponService {
                 }
                 if (hasGoodsCoupon) {
                     activityCouponBean.setCouponPic(memberCoupon.getLogo());
-                    if (StringUtils.isNotBlank(unChooseCouponCode) && unChooseCouponCode.equals(activityCouponBean.getCouponCode())){
+                    if (StringUtils.isNotBlank(chooseCouponCode) && chooseCouponCode.equals(activityCouponBean.getCouponCode())){
                         activityCouponBean.setSelected(YesOrNoEnum.YES.getCode());
                         usableCoupons.add(activityCouponBean);
                         usableCouponNum = usableCouponNum + 1;

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

@@ -49,6 +49,12 @@ public class CouponSharingService {
                     .startsWith(CommonsConstant.COUPON_PREFIX)).collect(Collectors.toList());
             // 是否存在商品券
             boolean hasGoodssCoupon = CollectionUtils.isNotEmpty(tmpCartGoods);
+            String chooseCouponCode = "";
+            if (StringUtils.isBlank(couponPromotionVO.getUnChooseCouponCode()) && hasGoodssCoupon){
+                chooseCouponCode = tmpCartGoods.get(0).getGoodsId().substring(CommonsConstant.COUPON_PREFIX.length());
+            } else {
+                chooseCouponCode = couponPromotionVO.getUnChooseCouponCode();
+            }
             // 构建可用不可用优惠券
             ActivityClassifyCouponBean activityClassifyCouponBean = couponService.availableCoupon(cartGoodsList
                     , couponPromotionVO.getPartnerId()
@@ -60,7 +66,7 @@ public class CouponSharingService {
                     , 1
                     , shoppingCartInfoRequestVo.getAppId()
                     , shoppingCartInfoRequestVo.getMenuType()
-                    , couponPromotionVO.getUnChooseCouponCode()
+                    , chooseCouponCode
             );
             if (Objects.equals(activityClassifyCouponBean, null)) {
                 // 构建一个空得订单券信息