Commit ec345320 by 徐光兴

修改逻辑。

parent 22d7fb64
...@@ -200,7 +200,7 @@ public enum ResponseResult { ...@@ -200,7 +200,7 @@ public enum ResponseResult {
* 支付 * 支付
*/ */
PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常","Abnormal payment transaction"), PAY_BACKEND_CONFIG_ERROR("58003", "支付交易异常","Abnormal payment transaction"),
PAY_SVC_CONFIG_ERROR("58004", "不支持储值卡",""), PAY_SVC_CONFIG_ERROR("58004", "不支持储值卡支付",""),
/** /**
* 优惠券活动 * 优惠券活动
*/ */
......
...@@ -148,7 +148,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService { ...@@ -148,7 +148,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
private List<String> buyProductOncePartnerIds; private List<String> buyProductOncePartnerIds;
@Value("#{'${virtual.product.svc.pay.partnerId}'.split(',')}") @Value("#{'${virtual.product.svc.pay.partnerId:}'.split(',')}")
private List<String> virtualProductSvcPayPartnerId; private List<String> virtualProductSvcPayPartnerId;
private final String SUCCESS = "100"; private final String SUCCESS = "100";
...@@ -301,7 +301,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService { ...@@ -301,7 +301,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
String partnerId = userLoginInfoDto.getPartnerId(); String partnerId = userLoginInfoDto.getPartnerId();
String storeId = requestVo.getShopId(); String storeId = requestVo.getShopId();
String userId = userLoginInfoDto.getMemberId(); String userId = userLoginInfoDto.getMemberId();
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); return ResponseUtil.error(ResponseResult.PAY_SVC_CONFIG_ERROR);
} }
//查询门店信息 //查询门店信息
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment