From 65f5fc5234a78dcd9db2ad7fe3506290b8c0769c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Tue, 30 Jul 2024 15:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.xml   | 2 +-
 .../com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.xml
index b8bd3a61..9647cdf4 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.xml
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.userType != null  and query.userType != ''"> and sr.user_type = #{query.userType}</if>
         <if test="query.userId != null "> and sr.user_id = #{query.userId}</if>
         <if test="query.userName != null  and query.userName != ''"> and sr.user_name like concat('%', #{query.userName}, '%')</if>
-        <if test="query.billMchId != null "> and smb.user_id = #{query.billMchId}</if>
+        <if test="query.billMchId != null "> and smb.mch_id = #{query.billMchId}</if>
     </sql>
 
     <select id="selectRefundList" parameterType="Refund" resultMap="RefundResult">
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java
index 5499feec..12c9e2f8 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/service/impl/RefundConverterImpl.java
@@ -41,7 +41,7 @@ public class RefundConverterImpl implements RefundConverter {
         refund.setBillId(dto.getBillId());
         refund.setAmount(dto.getRefundAmount());
         refund.setStatus(RefundStatus.REFUNDING.getStatus());
-        refund.setReason(String.format("套餐订单%s退款", bill.getBillNo()));
+        refund.setReason(String.format("充值订单%s退款", bill.getBillNo()));
         refund.setMchAmount(refundMchAmount);
         refund.setServiceAmount(refundServiceAmount);
         refund.setUserType(dto.getUserType());