西格玛许 15 saat önce
ebeveyn
işleme
0b24ed9b98

+ 3 - 0
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/domain/CsSession.java

@@ -87,3 +87,6 @@ public class CsSession {
 
     private String sourceId;
 }
+
+
+

+ 8 - 0
ruoyi-modules/ruoyi-main/src/main/java/org/dromara/main/service/impl/PaymentConfigServiceImpl.java

@@ -61,8 +61,12 @@ public class PaymentConfigServiceImpl implements IPaymentConfigService {
     public PaymentConfigVo getWechatPayConfig() {
         PaymentConfig config = getOrCreateWechatConfig();
         PaymentConfigVo vo = new PaymentConfigVo();
+        vo.setAppId(config.getAppId());
         vo.setMchId(config.getMchId());
         vo.setApiV3Key(config.getApiV3Key());
+        vo.setSerialNo(config.getSerialNo());
+        vo.setPrivateKeyPath(config.getPrivateKeyPath());
+        vo.setCertPath(config.getCertPath());
         vo.setNotifyUrl(config.getPayNotifyUrl());
         vo.setPublicKeyId(config.getPublicKeyId());
         vo.setPrivateKeyUploaded(config.getPrivateKeyPath() != null && !config.getPrivateKeyPath().isEmpty());
@@ -75,8 +79,12 @@ public class PaymentConfigServiceImpl implements IPaymentConfigService {
     @Transactional(rollbackFor = Exception.class)
     public void saveWechatPayConfig(PaymentConfigBo bo) {
         PaymentConfig config = getOrCreateWechatConfig();
+        config.setAppId(bo.getAppId());
         config.setMchId(bo.getMchId());
         config.setApiV3Key(bo.getApiV3Key());
+        config.setSerialNo(bo.getSerialNo());
+        config.setPrivateKeyPath(bo.getPrivateKeyPath());
+        config.setCertPath(bo.getCertPath());
         config.setPayNotifyUrl(bo.getNotifyUrl());
         config.setPublicKeyId(bo.getPublicKeyId());
         saveOrUpdate(config);

+ 4 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/PaymentConfigBo.java

@@ -11,8 +11,12 @@ import java.math.BigDecimal;
 public class PaymentConfigBo {
 
     // 微信支付配置
+    private String appId;
     private String mchId;
     private String apiV3Key;
+    private String serialNo;
+    private String privateKeyPath;
+    private String certPath;
     private String notifyUrl;
 
     // 微信支付公钥配置(新商户需要)

+ 4 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/PaymentConfigVo.java

@@ -11,8 +11,12 @@ import java.math.BigDecimal;
 public class PaymentConfigVo {
 
     // 微信支付配置
+    private String appId;
     private String mchId;
     private String apiV3Key;
+    private String serialNo;
+    private String privateKeyPath;
+    private String certPath;
     private String notifyUrl;
     private Boolean privateKeyUploaded;
     private Boolean certUploaded;