From 985abf1fadf7459747d7dde66243179fed201c80 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 24 Sep 2024 22:10:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A4=AA=E7=B1=B3=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/WxPayService.java     |  2 +-
 .../mapper/system/EtChannelMapper.xml         | 36 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
index f6efcfb..799b7fd 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
@@ -117,6 +117,7 @@ public class WxPayService implements IWxPayService {
                     throw new ServiceException("运营商【"+sysDept.getDeptName()+"】没有支付渠道");
                 }
                 ChannelVO channelVO = etChannelService.selectSmChannelByChannelId(payChannel);
+                log.info("支付渠道------"+JSON.toJSON(channelVO));
                 String outTradeNo = null;
                 if(PayChannel.CT_WX.equalsCode(channelVO.getCode()) || PayChannel.YS_WX.equalsCode(channelVO.getCode())){
                     outTradeNo = IdUtils.getOrderNo("wx");
@@ -145,7 +146,6 @@ public class WxPayService implements IWxPayService {
                     request.setMchid(channelVO.getMerchantId());
                     request.setAttach(JSON.toJSONString(new AttachVo(payType,user.getUserId(), "")));
                     request.setDescription(description);
-                    log.info("支付渠道------"+JSON.toJSON(channelVO));
                     request.setNotifyUrl(channelVO.getNotifyUrl());
                     request.setPayer(getPayer(user.getWxopenid()));
                     JsapiServiceExtension jsapiServiceExtension = getJsapiServiceExtension(channelVO);
diff --git a/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml
index 1fdad4d..7b97a4a 100644
--- a/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml
+++ b/electripper-system/src/main/resources/mapper/system/EtChannelMapper.xml
@@ -22,7 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sc.private_key_path,
             sc.merchant_serial_number,
             sc.refund_notify_url,
-            sc.appid
+            sc.appid,
+            sc.developer_id,
+            sc.shop_id,
+            sc.http_url,
+            sc.sign_key,
+            sc.sn
         from et_channel sc
     </sql>
 
@@ -58,6 +63,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enabled != null">enabled,</if>
             <if test="costRate != null">cost_rate,</if>
             <if test="picture != null">picture,</if>
+            <if test="merchantId != null">merchant_id,</if>
+            <if test="apiV3Key != null">api_v3_key,</if>
+            <if test="notifyUrl != null">notify_url,</if>
+            <if test="privateKeyPath != null">private_key_path,</if>
+            <if test="merchantSerialNumber != null">merchant_serial_number,</if>
+            <if test="refundNotifyUrl != null">refund_notify_url,</if>
+            <if test="appid != null">appid,</if>
+            <if test="developerId != null">developer_id,</if>
+            <if test="shopId != null">shop_id,</if>
+            <if test="httpUrl != null">http_url,</if>
+            <if test="signKey != null">sign_key,</if>
+            <if test="sn != null">sn,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="channelId != null">#{channelId},</if>
@@ -66,6 +83,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enabled != null">#{enabled},</if>
             <if test="costRate != null">#{costRate},</if>
             <if test="picture != null">#{picture},</if>
+            <if test="merchantId != null">#{merchantId},</if>
+            <if test="apiV3Key != null">#{apiV3Key},</if>
+            <if test="notifyUrl != null">#{notifyUrl},</if>
+            <if test="privateKeyPath != null">#{privateKeyPath},</if>
+            <if test="merchantSerialNumber != null">#{merchantSerialNumber},</if>
+            <if test="refundNotifyUrl != null">#{refundNotifyUrl},</if>
+            <if test="appid != null">#{appid},</if>
+            <if test="developerId != null">#{developerId},</if>
+            <if test="shopId != null">#{shopId},</if>
+            <if test="httpUrl != null">#{httpUrl},</if>
+            <if test="signKey != null">#{signKey},</if>
+            <if test="sn != null">#{sn},</if>
          </trim>
     </insert>
 
@@ -84,6 +113,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="data.merchantSerialNumber != null">merchant_serial_number = #{data.merchantSerialNumber},</if>
             <if test="data.refundNotifyUrl != null">refund_notify_url = #{data.refundNotifyUrl},</if>
             <if test="data.appid != null">appid = #{data.appid},</if>
+            <if test="data.developerId != null">developer_id = #{data.developerId},</if>
+            <if test="data.shopId != null">shop_id = #{data.shopId},</if>
+            <if test="data.httpUrl != null">http_url = #{data.httpUrl},</if>
+            <if test="data.signKey != null">sign_key = #{data.signKey},</if>
+            <if test="data.sn != null">sn = #{data.sn},</if>
         </trim>
         where channel_id = #{data.channelId}
     </update>