兼容老代码逻辑

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

shopping-cart-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -553,20 +553,26 @@ public class CouponAdapter {
         couponPromotionVO.setUserId(userLoginInfoDto.getMemberId());
         couponPromotionVO.setStoreId(shoppingCartInfoRequestVo.getShopId());
         // 删除配送券-> 商品券使用逻辑组装
-        List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
-        if (CollectionUtils.isEmpty(couponCodes)) {
-            couponPromotionVO.setCouponCode("");
-        }else {
-            ShoppingCartInfoRequestVo.couponCode otherCouponCode = couponCodes.stream()
-                    .filter(couponCode -> !couponCode.getCouponType().equals(CouponTypeEnum.TYPE_5.getCode()))
-                    // 只能使用一张券 排除配送券情况下
-                    .findFirst().orElse(null);
-            if (otherCouponCode !=null) {
-                couponPromotionVO.setCouponCode(otherCouponCode.getCouponCode());
-            }else {
+        String couponCode1 = shoppingCartInfoRequestVo.getCouponCode();
+        if (Objects.isNull(couponCode1)) {
+            List<ShoppingCartInfoRequestVo.couponCode> couponCodes = shoppingCartInfoRequestVo.getCouponCodes();
+            if (CollectionUtils.isEmpty(couponCodes)) {
                 couponPromotionVO.setCouponCode("");
+            }else {
+                ShoppingCartInfoRequestVo.couponCode otherCouponCode = couponCodes.stream()
+                        .filter(couponCode -> !couponCode.getCouponType().equals(CouponTypeEnum.TYPE_5.getCode()))
+                        // 只能使用一张券 排除配送券情况下
+                        .findFirst().orElse(null);
+                if (otherCouponCode !=null) {
+                    couponPromotionVO.setCouponCode(otherCouponCode.getCouponCode());
+                }else {
+                    couponPromotionVO.setCouponCode("");
+                }
             }
+        }else {
+            couponPromotionVO.setCouponCode(couponCode1);
         }
+
         couponPromotionVO.setOrderType(shoppingCartInfoRequestVo.getOrderType());
         couponPromotionVO.setFlg(shoppingCartInfoRequestVo.getFlag());
         couponPromotionVO.setUnChooseCouponCode(shoppingCartInfoRequestVo.getUnChooseCouponCode());