diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java index 86ac26f5..fb000537 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java @@ -121,7 +121,7 @@ public class PayController { } } if(checkOpen){ - boolean openAliPay = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WX_PAY); + boolean openAliPay = trdPayManager.checkOpenWx(); if(!openAliPay){ orderLogsService.createBaseFail(dto.getOrderNo(),"四方微信支付","第四方微信未开启"); return R.fail(600,"微信支付失败!未开启微信通道!"); @@ -274,7 +274,7 @@ public class PayController { } - @PostMapping(value = "/wx") + /*@PostMapping(value = "/wx") @Operation(summary = "微信支付") @Log(title = "微信支付", businessType = BusinessType.OTHER, isSaveDb = true) public R appPay(@RequestBody PayControllerDTO dto) { @@ -335,7 +335,7 @@ public class PayController { resp.setData(jsonStr); orderLogsService.createBaseSuccess(dto.getOrderNo(),"微信支付"); return R.ok(resp); - } + }*/ // @PostMapping(value = "/ali") // @Operation(summary = "支付宝支付") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java index 6ba52a7d..9c64678c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java @@ -59,7 +59,7 @@ public class SettingAppController { SettingGoodsVo vo = new SettingGoodsVo(); if(useTrdPay){ // 使用第三方支付 vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY)); - vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY)); + vo.setHasWechatPay(trdPayManager.checkOpenWxInt()); }else{ vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_SOURCE_ALI_PAY)); vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java index 0dc3bf14..eb148de8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/UserAppController.java @@ -98,7 +98,7 @@ public class UserAppController { boolean useTrdPay = trdPayManager.useTrdPay(LoginHelper.getUserId()); if(useTrdPay){ // 使用第三方支付 vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_ALI_PAY)); - vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY)); + vo.setHasWechatPay(trdPayManager.checkOpenWxInt()); }else{ vo.setHasAlipayPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_SOURCE_ALI_PAY)); vo.setHasWechatPay(systemConfigManager.getSystemConfigOfInt(SystemConfigEnum.OPEN_WX_PAY)); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PayTrdConfigService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PayTrdConfigService.java index 5a7f524a..99093607 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PayTrdConfigService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/PayTrdConfigService.java @@ -17,6 +17,8 @@ public interface PayTrdConfigService extends IService { PayReturnResp createOrderAli(PayOrderInfoDTO dto, boolean wx); + boolean openWx(boolean ios); + JSONObject queryOrder(String orderNo, String trdPayType); JSONObject resetOrder(String orderNo, String trdPayType,boolean updateData); 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 90293f35..e1caebf2 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,7 +5,6 @@ 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; @@ -98,6 +97,22 @@ public class PayTrdConfigServiceImpl extends ServiceImpl payTrdServiceList; private final Map payTrdServiceMap = new HashMap<>(); + @Autowired + private PayTrdConfigService payTrdConfigService; @PostConstruct public void init(){ @@ -72,6 +75,19 @@ public class TrdPayManager { @Autowired private DangerManger dangerManger; + public boolean checkOpenWx(){ + boolean openWx = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.OPEN_WX_PAY); + if(!openWx){ + return false; + } + boolean wx = payTrdConfigService.openWx(VersionUtil.isIos()); + return wx; + } + public int checkOpenWxInt(){ + boolean checked = checkOpenWx(); + return checked?1:0; + } + public PayReturnResp createOrderAliMerge(PayOrderInfoDTO payOrderInfoDTO, PayTrdConfig payTrdConfig,TrdPayTypeEnum typeEnum, boolean wx){ try { PayTrdService payTrdService = getPayTrdService(typeEnum.name()); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/dto/v14/V14PayResp.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/dto/v14/V14PayResp.java index 15baa0fb..fceecd3d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/dto/v14/V14PayResp.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/dto/v14/V14PayResp.java @@ -9,6 +9,7 @@ import java.math.BigDecimal; public class V14PayResp implements Serializable { private String payToken; private String orderNo; + private String api; private BigDecimal price; private String subject; private String sourceMinId = "gh_e126be743731"; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV14Service.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV14Service.java index ef48b59d..9a3ab3b0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV14Service.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/handle/PayTrdV14Service.java @@ -39,6 +39,7 @@ public class PayTrdV14Service implements PayTrdService { v14PayResp.setPrice(payOrderInfoDTO.getPrice()); v14PayResp.setSubject(payOrderInfoDTO.getSubject()); v14PayResp.setOrderNo(payOrderInfoDTO.getOrderNo()); + v14PayResp.setApi("apidjwklqw.mvsdiv.cn"); return PayReturnResp.createEfps(v14PayResp); }