|
|
@@ -329,7 +329,7 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
|
|
|
String notifyUrl = String.format("%s%s", host, BaseZfbConfig.wholesaleNotifyUrl);
|
|
|
//是否在微信内支付 微信内支付宝支付后 支付宝回调页面不跳转
|
|
|
Boolean isWx = Optional.ofNullable(re.getIsWx()).orElse(false);
|
|
|
- if (ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode) && !isWx) {
|
|
|
+ if (StrUtil.isEmpty(returnUrl) && ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode) && !isWx) {
|
|
|
//默认跳转页
|
|
|
returnUrl = String.format("%s%s", envCommonService.getDomain(), BaseZfbConfig.DEFAULT_URL);
|
|
|
}
|
|
|
@@ -369,7 +369,7 @@ public class AliPayCommonServiceImpl implements AliPayCommonService {
|
|
|
String notifyUrl = String.format("%s%s", host, BaseZfbConfig.wholesaleDepositNotifyUrl);
|
|
|
//是否在微信内支付 微信内支付宝支付后 支付宝回调页面不跳转
|
|
|
Boolean isWx = Optional.ofNullable(re.getIsWx()).orElse(false);
|
|
|
- if (ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode) && !isWx) {
|
|
|
+ if (StrUtil.isEmpty(returnUrl) && ZfbProductCode.MOBILE_WEB.getProductCode().equals(productCode) && !isWx) {
|
|
|
//默认跳转页
|
|
|
returnUrl = String.format("%s%s", envCommonService.getDomain(), BaseZfbConfig.DEFAULT_URL);
|
|
|
}
|