From 6708e537f11353d16658c386e2c97aa5413c5f31 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 13:55:03 +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

---
 .../ruoyi/ss/refund/domain/RefundQuery.java   |  5 +++
 .../ruoyi/ss/refund/mapper/RefundMapper.xml   | 10 +++--
 .../controller/mch/MchRefundController.java   | 37 +++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchRefundController.java

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
     </sql>
@@ -31,9 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.refundNo != null  and query.refundNo != ''"> and sr.refund_no = #{query.refundNo}</if>
         <if test="query.billId != null "> and sr.bill_id = #{query.billId}</if>
         <if test="query.status != null  and query.status != ''"> and sr.status = #{query.status}</if>
-        <if test="query.userType != null  and query.userType != ''"> and user_type = #{query.userType}</if>
-        <if test="query.userId != null "> and user_id = #{query.userId}</if>
-        <if test="query.userName != null  and query.userName != ''"> and user_name like concat('%', #{query.userName}, '%')</if>
+        <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>
     </sql>
 
     <select id="selectRefundList" parameterType="Refund" resultMap="RefundResult">
diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchRefundController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchRefundController.java
new file mode 100644
index 00000000..e0385cff
--- /dev/null
+++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchRefundController.java
@@ -0,0 +1,37 @@
+package com.ruoyi.web.controller.mch;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.ss.refund.domain.RefundQuery;
+import com.ruoyi.ss.refund.domain.RefundVO;
+import com.ruoyi.ss.refund.service.RefundService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author wjh
+ * 2024/7/30
+ */
+@RestController
+@RequestMapping("/mch/refund")
+public class MchRefundController extends BaseController {
+
+    @Autowired
+    private RefundService refundService;
+
+    @ApiOperation("订单收款人查询退款列表")
+    @GetMapping("/list")
+    public TableDataInfo list(RefundQuery query)
+    {
+        startPage();
+        query.setBillMchId(getUserId());
+        List<RefundVO> list = refundService.selectRefundList(query);
+        return getDataTable(list);
+    }
+
+}