Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa

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

@@ -562,13 +562,20 @@ public class CouponAdapter {
             couponPromotionVO.setCouponCodes(setCoupons);
         }
         // 兼容老版本
-        if(!Objects.isNull(couponCode1)){
+        if(StringUtils.isNotBlank(couponCode1)){
             couponPromotionVO.setCouponCode(couponCode1);
         }
 
         couponPromotionVO.setOrderType(shoppingCartInfoRequestVo.getOrderType());
         couponPromotionVO.setFlg(shoppingCartInfoRequestVo.getFlag());
         couponPromotionVO.setUnChooseCouponCode(shoppingCartInfoRequestVo.getUnChooseCouponCode());
+        // 重新校验一遍 couponcodes
+        if (CollectionUtils.isNotEmpty(couponPromotionVO.getCouponCodes())) {
+            Set<String> collect = couponPromotionVO.getCouponCodes().stream().filter(s -> !"".equals(s)).collect(Collectors.toSet());
+            if (CollectionUtils.isNotEmpty(collect)) {
+                couponPromotionVO.setCouponCodes(null);
+            }
+        }
         return couponPromotionVO;
     }