This commit is contained in:
777
2025-06-10 11:36:10 +08:00
parent 340b99a0c6
commit 7c210f69f6
4 changed files with 24 additions and 2 deletions

View File

@@ -19,3 +19,8 @@ CREATE TABLE `cai_order_logs`
) ENGINE = InnoDB ) ENGINE = InnoDB
AUTO_INCREMENT = 1; AUTO_INCREMENT = 1;
ALTER TABLE `cai_pay_trd_config`
ADD COLUMN `enable_ios` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否开启IOS' AFTER `mch_id`;

View File

@@ -33,6 +33,7 @@ public class PayTrdConfig implements Serializable {
* 第三方支付名称 * 第三方支付名称
*/ */
private String name; private String name;
private Integer enableIos;
/** /**
* 请求域名 * 请求域名
*/ */

View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.PayTrdConfig; import com.ruoyi.cai.domain.PayTrdConfig;
import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.enums.version.VersionPlatformEnum;
import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.manager.SystemConfigManager;
import com.ruoyi.cai.mapper.PayTrdConfigMapper; import com.ruoyi.cai.mapper.PayTrdConfigMapper;
import com.ruoyi.cai.pay.PayManager; import com.ruoyi.cai.pay.PayManager;
@@ -15,6 +16,7 @@ import com.ruoyi.cai.service.OrderLogsService;
import com.ruoyi.cai.service.PayTrdConfigService; import com.ruoyi.cai.service.PayTrdConfigService;
import com.ruoyi.cai.trdpay.TrdPayManager; import com.ruoyi.cai.trdpay.TrdPayManager;
import com.ruoyi.cai.trdpay.TrdPayTypeEnum; import com.ruoyi.cai.trdpay.TrdPayTypeEnum;
import com.ruoyi.cai.util.VersionUtil;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
@@ -82,7 +84,7 @@ public class PayTrdConfigServiceImpl extends ServiceImpl<PayTrdConfigMapper, Pay
} }
} }
if(payTrdConfig == null){ if(payTrdConfig == null){
payTrdConfig = getConfigV2(wx); payTrdConfig = getConfigV2(wx, VersionUtil.isIos());
} }
if(payTrdConfig == null){ if(payTrdConfig == null){
throw new ServiceException("未开启支付,请联系客服"); throw new ServiceException("未开启支付,请联系客服");
@@ -101,9 +103,14 @@ public class PayTrdConfigServiceImpl extends ServiceImpl<PayTrdConfigMapper, Pay
* @param wx * @param wx
* @return * @return
*/ */
private static PayTrdConfig getConfigV2(boolean wx){ private static PayTrdConfig getConfigV2(boolean wx,boolean ios){
List<PayTrdConfig> list = new ArrayList<>(); List<PayTrdConfig> list = new ArrayList<>();
for(PayTrdConfig payTrdConfig : PAY_TRD_CONFIG_LIST){ for(PayTrdConfig payTrdConfig : PAY_TRD_CONFIG_LIST){
if(ios){
if(payTrdConfig.getEnableIos() == 0){
continue;
}
}
if(wx){ if(wx){
if(payTrdConfig.getEnableWxStatus() == 0){ if(payTrdConfig.getEnableWxStatus() == 0){
continue; continue;

View File

@@ -12,6 +12,15 @@ public class VersionUtil {
return request.getHeader("version"); return request.getHeader("version");
} }
public static boolean isIos(){
HttpServletRequest request = ServletUtils.getRequest();
String sourceId = request.getHeader("source_id");
if("2".equals(sourceId)){
return true;
}
return false;
}
public static VersionPlatformEnum getVersionPlatform(){ public static VersionPlatformEnum getVersionPlatform(){
HttpServletRequest request = ServletUtils.getRequest(); HttpServletRequest request = ServletUtils.getRequest();
String sourceId = request.getHeader("source_id"); String sourceId = request.getHeader("source_id");