diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/RefundQuery.java b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/RefundQuery.java
index 3bbd3225..3cbf5be8 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/RefundQuery.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/RefundQuery.java
@@ -1,5 +1,6 @@
package com.ruoyi.ss.refund.domain;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,4 +9,8 @@ import lombok.Data;
*/
@Data
public class RefundQuery extends Refund {
+
+ @ApiModelProperty("订单收款人ID")
+ private Long billMchId;
+
}
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 52284511..b8bd3a61 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
@@ -21,7 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sr.user_id,
sr.user_name,
smb.money as bill_amount,
- smb.bill_no as bill_no
+ smb.bill_no as bill_no,
+ smb.mch_id as bill_mch_id
from ss_refund sr
left join sm_transaction_bill smb on smb.bill_id = sr.bill_id
@@ -31,9 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and sr.refund_no = #{query.refundNo}
and sr.bill_id = #{query.billId}
and sr.status = #{query.status}
- and user_type = #{query.userType}
- and user_id = #{query.userId}
- and user_name like concat('%', #{query.userName}, '%')
+ and sr.user_type = #{query.userType}
+ and sr.user_id = #{query.userId}
+ and sr.user_name like concat('%', #{query.userName}, '%')
+ and smb.user_id = #{query.billMchId}