Merge branch 'feature/V2.0.52_储值卡支持购买虚拟商品' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -202,7 +202,7 @@ public enum ResponseResult {
      * 支付
      */
     PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常","Abnormal payment transaction"),
-    PAY_SVC_CONFIG_ERROR("58004", "不支持储值卡",""),
+    PAY_SVC_CONFIG_ERROR("58004", "不支持储值卡支付",""),
     /**
      * 优惠券活动
      */

order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

@@ -152,7 +152,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
     private List<String> buyProductOncePartnerIds;
 
 
-    @Value("#{'${virtual.product.svc.pay.partnerId}'.split(',')}")
+    @Value("#{'${virtual.product.svc.pay.partnerId:}'.split(',')}")
     private List<String> virtualProductSvcPayPartnerId;
 
     private final String SUCCESS = "100";
@@ -318,7 +318,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         String openId = userLoginInfoDto.getOpenId();
         String appId = userLoginInfoDto.getAppId();
 
-        if (CollectionUtils.isNotEmpty(virtualProductSvcPayPartnerId) && !virtualProductSvcPayPartnerId.contains(partnerId)) {
+        if (StringUtils.isNotBlank(requestVo.getCardCode()) && CollectionUtils.isNotEmpty(virtualProductSvcPayPartnerId) && !virtualProductSvcPayPartnerId.contains(partnerId)) {
             return ResponseUtil.error(ResponseResult.PAY_SVC_CONFIG_ERROR);
         }
         //查询门店信息