From f3a9264e74c29a7d22de71b0cbb85a70623f7087 Mon Sep 17 00:00:00 2001
From: jianlin <q614588746@163.com>
Date: Sun, 27 Apr 2025 09:55:41 +0800
Subject: [PATCH] =?UTF-8?q?4.27bug=E4=BF=AE=E6=94=B9=20=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E9=87=91=E5=B8=81=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=95=86=E5=93=81=E5=90=8D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/controller/ActivityController.java  |  1 +
 src/main/java/com/example/demo/mapper/ActivityMapper.java     |  2 +-
 src/main/resources/mapper/ConsumeMapper.xml                   | 11 +++++------
 src/main/resources/mapper/ProductMapper.xml                   |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/example/demo/controller/ActivityController.java b/src/main/java/com/example/demo/controller/ActivityController.java
index 744099e..4f090d0 100644
--- a/src/main/java/com/example/demo/controller/ActivityController.java
+++ b/src/main/java/com/example/demo/controller/ActivityController.java
@@ -55,6 +55,7 @@ public class ActivityController {
          Integer pageSize=page.getPageSize();
          Activity activity= page.getActivity();
         if (ObjectUtils.isEmpty(pageNum)){
+
             return  Result.success(activityService.search(activity));
         }
         return Result.success(activityService.searchForPage(pageNum,pageSize,activity));
diff --git a/src/main/java/com/example/demo/mapper/ActivityMapper.java b/src/main/java/com/example/demo/mapper/ActivityMapper.java
index 9b23163..efe5d07 100644
--- a/src/main/java/com/example/demo/mapper/ActivityMapper.java
+++ b/src/main/java/com/example/demo/mapper/ActivityMapper.java
@@ -49,7 +49,7 @@ public interface ActivityMapper {
     //模糊查询--根据活动id查询活动信息
     @Select({
             "<script>",
-            "SELECT activity.*, admin.name FROM activity",
+            "SELECT  activity.*, admin.name FROM activity",
             "INNER JOIN admin ON activity.admin_id = admin.admin_id",
             "<where>",
             "activity.activity_flag = 1",
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index 3cd0266..e397dc9 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -10,11 +10,10 @@
         sum(recharge_coin) as SumRcion,
         sum(recharge_coin+free_coin+task_coin) as Sumcion
         from detail_y
-        left join product on detail_y.product_id= product.product_id
         <where>
         update_type = '1'
             <if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode =#{jwcode}</if>
-            <if test='productName!=null and productName.length>0'>and product.name = #{productName}</if>
+            <if test='productName!=null and productName.length>0'>and detail_y.product_name = #{productName}</if>
             <if test='consumePlatform!=null and consumePlatform.length>0'>and detail_y.consume_platform=#{consumePlatform}</if>
             <if test='consumeType!=null and consumeType.length>0'>and detail_y.consume_type= #{consumeType}</if>
             <if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>
@@ -30,19 +29,19 @@
     <select id="select" resultType="com.example.demo.domain.vo.ConsumeDetail">
         SELECT
         detail_y.*,
-        admin.name AS adminName,
-       /* product.name AS productName*/
+        admin.name AS adminName
+
         FROM detail_y
         LEFT JOIN `admin` ON detail_y.admin_id = admin.admin_id
         LEFT JOIN `user` ON detail_y.jwcode = user.jwcode
-        LEFT JOIN product ON detail_y.product_id = product.product_id
+
         <where>
             update_type = 1
             <if test='jwcode != null'>
                 AND detail_y.jwcode = #{jwcode}
             </if>
             <if test='productName != null and productName.length > 0'>
-                AND product.name = #{productName}
+                AND detail_y.product_name = #{productName}
             </if>
             <if test='consumePlatform != null and consumePlatform.length > 0'>
                 AND detail_y.consume_platform = #{consumePlatform}
diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml
index c0f4183..0b633ce 100644
--- a/src/main/resources/mapper/ProductMapper.xml
+++ b/src/main/resources/mapper/ProductMapper.xml
@@ -13,6 +13,6 @@
 
     <!--查询消费表的商品名-->
     <select id="findAllProductName" resultType="java.lang.String">
-        select DISTINCT product_name from detail_y
+        select DISTINCT product_name from detail_y where product_name is not null and update_type = 1
     </select>
 </mapper>
\ No newline at end of file