From 7624973628a0d5f41d45edcb358ea4c0cdb8c918 Mon Sep 17 00:00:00 2001
From: jianlin <q614588746@163.com>
Date: Sun, 18 May 2025 15:50:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=91=E5=B8=81bug=E4=BF=AE=E6=94=B95.18?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/domain/entity/Detail.java     |  2 +-
 .../java/com/example/demo/mapper/RefundMapper.java |  6 ++++++
 .../com/example/demo/mapperLink/DouMapper.java     |  2 ++
 .../demo/serviceImpl/RefundServiceImpl.java        |  8 ++++++++
 .../com/example/demo/sevice/RefundService.java     |  1 +
 src/main/resources/mapper/RefundMapper.xml         | 23 ++++++++++++++++++++--
 src/main/resources/mapperLink/DouMapper.xml        | 11 +++++++++++
 7 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java
index 5c35695..139d798 100644
--- a/src/main/java/com/example/demo/domain/entity/Detail.java
+++ b/src/main/java/com/example/demo/domain/entity/Detail.java
@@ -74,5 +74,5 @@ public class Detail implements Serializable {
     private String sortOrder;
     private List<String> areas;
 
-
+    private Boolean hasIndexMatch;
 }
diff --git a/src/main/java/com/example/demo/mapper/RefundMapper.java b/src/main/java/com/example/demo/mapper/RefundMapper.java
index 86e554f..e2ada20 100644
--- a/src/main/java/com/example/demo/mapper/RefundMapper.java
+++ b/src/main/java/com/example/demo/mapper/RefundMapper.java
@@ -105,5 +105,11 @@ public interface RefundMapper {
 //            "</choose>",
 //            "</script>"
 //    })
+    //查询退款商品
     List<Detail>    select(Detail detail);
+    //检查product是否有type值
+    boolean isIndexTypeExist(@Param("name") String name);
+
 }
+
+
diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java
index e3fb481..da62e67 100644
--- a/src/main/java/com/example/demo/mapperLink/DouMapper.java
+++ b/src/main/java/com/example/demo/mapperLink/DouMapper.java
@@ -9,6 +9,8 @@ import java.util.List;
 @Mapper
 public interface DouMapper {
     int add(Records Records);
+    //添加充值审核记录到审核表
+    void addDouAudit(Records records);
     Member searchinfo(Searchinfo jwcode);
     Integer searchId(@Param("jwcode")String jwcode);
     List<Yve> getYve(Yve yve);
diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
index 1c4d176..facd657 100644
--- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
@@ -118,6 +118,12 @@ public class RefundServiceImpl implements RefundService {
     @Cacheable(key = "#root.method.name + ':' + #pageNum + '-' + #pageSize + '-' + T(java.util.Objects).hashCode(#detail)")
     @Override
     public PageInfo<Detail> searchForPage(Integer pageNum, Integer pageSize, Detail detail) {
+        // 如果 refundGoods 存在，则判断是否匹配 index 表中的 remark
+        if (detail.getRefundGoods() != null && !detail.getRefundGoods().trim().isEmpty()) {
+            boolean matchExists = refundMapper.isIndexTypeExist(detail.getRefundGoods());
+            detail.setHasIndexMatch(matchExists); // 设置标志位
+        }
+
         PageHelper.startPage(pageNum, pageSize);
         List<Detail> list = refundMapper.select(detail);
         return new PageInfo<>(list);
@@ -152,4 +158,6 @@ public class RefundServiceImpl implements RefundService {
 
         return result;
     }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/sevice/RefundService.java b/src/main/java/com/example/demo/sevice/RefundService.java
index 209bf41..3b709de 100644
--- a/src/main/java/com/example/demo/sevice/RefundService.java
+++ b/src/main/java/com/example/demo/sevice/RefundService.java
@@ -23,4 +23,5 @@ public interface RefundService {
     PageInfo<Detail> searchForPage(Integer pageNum, Integer pageSize, Detail detail);
     List<RefundA> getRefundA(RefundA refundA);
 
+
 }
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index f84d14e..01cb596 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -83,8 +83,20 @@
             <if test='refundType != null and refundType.length > 0'>
                 AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')
             </if>
-            <if test='refundGoods != null and refundGoods.length > 0'>
-                AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')
+            <if test='refundGoods != null and refundGoods.length() > 0'>
+                <choose>
+                    <!-- 是否走精确匹配 -->
+                    <when test="hasIndexMatch">
+                        AND d.refund_goods IN (
+                        SELECT name FROM `index`
+                        WHERE type = 1 AND remark = #{refundGoods}
+                        )
+                    </when>
+                    <!-- 否则模糊匹配 -->
+                    <otherwise>
+                        AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')
+                    </otherwise>
+                </choose>
             </if>
             <if test='startDate != null and endDate != null'>
                 AND d.create_time BETWEEN #{startDate} AND #{endDate}
@@ -140,4 +152,11 @@
         ORDER BY
         detaily_id DESC
     </select>
+    <!--检查是否有type值-->
+    <select id="isIndexTypeExist" resultType="java.lang.Boolean">
+        SELECT EXISTS (
+            SELECT 1 FROM product
+            WHERE type = 1 AND name = #{name}
+        )
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml
index 3fdbb36..47d7476 100644
--- a/src/main/resources/mapperLink/DouMapper.xml
+++ b/src/main/resources/mapperLink/DouMapper.xml
@@ -8,6 +8,17 @@
         insert into fx_yaoqing_records (uid,content,money,money_free,money_buy,time,type,data)
         values(#{uid},#{content},#{money},#{moneyFree},#{moneyBuy},#{time},1,#{data})
     </insert>
+   <!-- 添加金豆充值审核到审核表-->
+    <insert id="addDouAudit" >
+    insert into audit_records (
+                               nickname,jwcode,areas,data,content,money,money_free,money_buy,time,type)
+        values(#{nickname},{jwcode},#{areas},#{data},#{content},#{money},#{moneyFree},#{moneyBuy},#{time},1)
+
+    </insert>
+
+
+
+
     <select id="searchinfo" resultType="com.example.demo.domain.dou.Member">
         SELECT
             fm.nickname,

From a0f8b0d33014d8758a4e1f686eb8ef92e2eccf22 Mon Sep 17 00:00:00 2001
From: jianlin <q614588746@163.com>
Date: Sun, 18 May 2025 15:52:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=91=E5=B8=81bug=E4=BF=AE=E6=94=B95.18?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/mapperLink/DouMapper.java | 3 +--
 src/main/resources/mapperLink/DouMapper.xml              | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java
index da62e67..626d14d 100644
--- a/src/main/java/com/example/demo/mapperLink/DouMapper.java
+++ b/src/main/java/com/example/demo/mapperLink/DouMapper.java
@@ -9,8 +9,7 @@ import java.util.List;
 @Mapper
 public interface DouMapper {
     int add(Records Records);
-    //添加充值审核记录到审核表
-    void addDouAudit(Records records);
+
     Member searchinfo(Searchinfo jwcode);
     Integer searchId(@Param("jwcode")String jwcode);
     List<Yve> getYve(Yve yve);
diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml
index 47d7476..a92bf05 100644
--- a/src/main/resources/mapperLink/DouMapper.xml
+++ b/src/main/resources/mapperLink/DouMapper.xml
@@ -8,14 +8,6 @@
         insert into fx_yaoqing_records (uid,content,money,money_free,money_buy,time,type,data)
         values(#{uid},#{content},#{money},#{moneyFree},#{moneyBuy},#{time},1,#{data})
     </insert>
-   <!-- 添加金豆充值审核到审核表-->
-    <insert id="addDouAudit" >
-    insert into audit_records (
-                               nickname,jwcode,areas,data,content,money,money_free,money_buy,time,type)
-        values(#{nickname},{jwcode},#{areas},#{data},#{content},#{money},#{moneyFree},#{moneyBuy},#{time},1)
-
-    </insert>
-
 
 
 

From b826f289d9f1e81692f9948bc60de63ade2c2354 Mon Sep 17 00:00:00 2001
From: jianlin <q614588746@163.com>
Date: Mon, 19 May 2025 16:44:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=91=E5=B8=81bug=E4=BF=AE=E6=94=B95.19?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=95=86=E5=93=81homilyChart=E9=87=91?=
 =?UTF-8?q?=E5=B8=81=E6=95=B0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/domain/vo/RefundA.java    |  2 +-
 .../com/example/demo/serviceImpl/RefundServiceImpl.java  |  6 ++++++
 src/main/resources/mapper/RefundMapper.xml               | 16 +++++++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/domain/vo/RefundA.java b/src/main/java/com/example/demo/domain/vo/RefundA.java
index 3d18d5f..d92abfb 100644
--- a/src/main/java/com/example/demo/domain/vo/RefundA.java
+++ b/src/main/java/com/example/demo/domain/vo/RefundA.java
@@ -41,5 +41,5 @@ public class RefundA  implements Serializable {
     private String category;
     private BigDecimal amount;
     private List<String> areas;
-
+    private Boolean hasIndexMatch;
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
index 3bb9a86..0ac46a4 100644
--- a/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/RefundServiceImpl.java
@@ -146,6 +146,12 @@ public class RefundServiceImpl implements RefundService {
 
     @Override
     public List<RefundA> getRefundA(RefundA refundA) {
+
+        // 如果 refundGoods 存在，则判断是否匹配 index 表中的 remark
+        if (refundA.getRefundGoods() != null && !refundA.getRefundGoods().trim().isEmpty()) {
+            boolean matchExists = refundMapper.isIndexTypeExist(refundA.getRefundGoods());
+            refundA.setHasIndexMatch(matchExists); // 设置标志位
+        }
         // 执行原始查询，获取实际存在的分类及其汇总值
         List<RefundA> result = refundMapper.getRefundA(refundA);
 
diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml
index 0ef7935..ed20662 100644
--- a/src/main/resources/mapper/RefundMapper.xml
+++ b/src/main/resources/mapper/RefundMapper.xml
@@ -34,7 +34,21 @@
             <if test='startDate != null and endDate != null'>AND d.create_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test='area!=null and area.length>0'>and user.area=#{area}</if>
             <if test='refundType != null and refundType.length>0'>AND d.refund_type LIKE CONCAT('%', #{refundType}, '%')</if>
-            <if test='refundGoods != null and refundGoods.length>0'>AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')</if>
+            <if test='refundGoods != null and refundGoods.length() > 0'>
+                <choose>
+                    <!-- 是否走精确匹配 -->
+                    <when test="hasIndexMatch">
+                        AND d.refund_goods IN (
+                        SELECT name FROM `index`
+                        WHERE type = 1 AND remark = #{refundGoods}
+                        )
+                    </when>
+                    <!-- 否则模糊匹配 -->
+                    <otherwise>
+                        AND d.refund_goods LIKE CONCAT('%', #{refundGoods}, '%')
+                    </otherwise>
+                </choose>
+            </if>
             <if test="areas != null">
                 AND area IN
                 <foreach collection="areas" item="areas" open="(" separator="," close=")">