nnnn

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<PayReturnResp> 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 = "支付宝支付")

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));

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));

ruoyi-cai/src/main/java/com/ruoyi/cai/service/PayTrdConfigService.java

@@ -17,6 +17,8 @@ public interface PayTrdConfigService extends IService<PayTrdConfig> {
 
     PayReturnResp createOrderAli(PayOrderInfoDTO dto, boolean wx);
 
+    boolean openWx(boolean ios);
+
     JSONObject queryOrder(String orderNo, String trdPayType);
 
     JSONObject resetOrder(String orderNo, String trdPayType,boolean updateData);

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<PayTrdConfigMapper, Pay
         return trdPayManager.createOrderAliMerge(dto, payTrdConfig, typeEnum, wx);
     }
 
+    @Override
+    public boolean openWx(boolean ios){
+        for(PayTrdConfig payTrdConfig : PAY_TRD_CONFIG_LIST){
+            if(ios){
+                if(payTrdConfig.getEnableWxStatus() == 1 && payTrdConfig.getEnableIos() == 1){
+                    return true;
+                }
+            } else {
+                if(payTrdConfig.getEnableWxStatus() == 1){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * 无价格版本
      * @param wx

ruoyi-cai/src/main/java/com/ruoyi/cai/trdpay/TrdPayManager.java

@@ -12,6 +12,7 @@ import com.ruoyi.cai.pay.PayReturnResp;
 import com.ruoyi.cai.service.AccountService;
 import com.ruoyi.cai.service.PayTrdConfigService;
 import com.ruoyi.cai.trdpay.dto.NotifyResp;
+import com.ruoyi.cai.util.VersionUtil;
 import com.ruoyi.common.exception.ServiceException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,8 @@ public class TrdPayManager {
     @Autowired
     private List<PayTrdService> payTrdServiceList;
     private final Map<String,PayTrdService> 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());

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";

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);
     }