diff --git a/doc/v5.sql b/doc/v5.sql index 5bd71ec3..c05b95db 100644 --- a/doc/v5.sql +++ b/doc/v5.sql @@ -19,3 +19,8 @@ CREATE TABLE `cai_order_logs` ) ENGINE = InnoDB AUTO_INCREMENT = 1; + + +ALTER TABLE `cai_pay_trd_config` + ADD COLUMN `enable_ios` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否开启IOS' AFTER `mch_id`; + diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PayTrdConfig.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PayTrdConfig.java index 8cb69aa0..9136779b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PayTrdConfig.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/PayTrdConfig.java @@ -33,6 +33,7 @@ public class PayTrdConfig implements Serializable { * 第三方支付名称 */ private String name; + private Integer enableIos; /** * 请求域名 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PayTrdConfigServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PayTrdConfigServiceImpl.java index 8a30fc71..90293f35 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PayTrdConfigServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/PayTrdConfigServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.PayTrdConfig; import com.ruoyi.cai.enums.SystemConfigEnum; +import com.ruoyi.cai.enums.version.VersionPlatformEnum; import com.ruoyi.cai.manager.SystemConfigManager; import com.ruoyi.cai.mapper.PayTrdConfigMapper; 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.trdpay.TrdPayManager; import com.ruoyi.cai.trdpay.TrdPayTypeEnum; +import com.ruoyi.cai.util.VersionUtil; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; @@ -82,7 +84,7 @@ public class PayTrdConfigServiceImpl extends ServiceImpl list = new ArrayList<>(); for(PayTrdConfig payTrdConfig : PAY_TRD_CONFIG_LIST){ + if(ios){ + if(payTrdConfig.getEnableIos() == 0){ + continue; + } + } if(wx){ if(payTrdConfig.getEnableWxStatus() == 0){ continue; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/VersionUtil.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/VersionUtil.java index f7bc74a8..8b1dffd0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/util/VersionUtil.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/util/VersionUtil.java @@ -12,6 +12,15 @@ public class VersionUtil { 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(){ HttpServletRequest request = ServletUtils.getRequest(); String sourceId = request.getHeader("source_id");