From 249c9d8805829eaee088e8546610d5df68b586ec Mon Sep 17 00:00:00 2001
From: jianlin <q614588746@163.com>
Date: Sat, 26 Apr 2025 11:53:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?4.26=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
index 2c191e8..82a0494 100644
--- a/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ActivityServiceImpl.java
@@ -62,9 +62,9 @@ public class ActivityServiceImpl implements ActivityService {
             Date endTime = activity1.getEndTime();
 
             // 使用 Date 类的 before 和 after 方法进行比较
-            if (nowDate.before(startTime)) {
+            if (startTime != null &&nowDate.before(startTime)) {
                 activity1.setStatus(0); // 设置状态为 0
-            } else if (nowDate.after(endTime)) {
+            } else if (endTime != null &&nowDate.after(endTime)) {
                 activity1.setStatus(2); // 设置状态为 2
             } else {
                 activity1.setStatus(1); // 设置状态为 1

From 1f32297c7ad94f2418db133189dbc248014977e2 Mon Sep 17 00:00:00 2001
From: jianlin <q614588746@163.com>
Date: Sat, 26 Apr 2025 17:04:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?4.26=E4=BF=AE=E5=A4=8Dbug=EF=BC=9A=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=90=8D=E7=A7=B0=E5=AF=B9=E5=BA=94=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/controller/ProductController.java   | 5 +++++
 src/main/java/com/example/demo/mapper/ProductMapper.java           | 3 +++
 src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java | 5 +++++
 src/main/java/com/example/demo/sevice/ProductService.java          | 3 +++
 src/main/resources/mapper/ConsumeMapper.xml                        | 2 +-
 src/main/resources/mapper/ProductMapper.xml                        | 5 +++++
 6 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/controller/ProductController.java b/src/main/java/com/example/demo/controller/ProductController.java
index 5f14dd6..3df8038 100644
--- a/src/main/java/com/example/demo/controller/ProductController.java
+++ b/src/main/java/com/example/demo/controller/ProductController.java
@@ -20,6 +20,11 @@ public class ProductController {
     public Result Product(@RequestBody Product product){
        return Result.success(productService.findAll(product));
     }
+    // 所有消费明细---获取商品名
+    @PostMapping("/findProductName")
+    public Result getProductName(){
+        return Result.success(productService.findAllProductName());
+    }
     @PostMapping("/add")
     public Result add(@RequestBody Product product){
         return Result.success(productService.add(product));
diff --git a/src/main/java/com/example/demo/mapper/ProductMapper.java b/src/main/java/com/example/demo/mapper/ProductMapper.java
index 521e478..5a2ff20 100644
--- a/src/main/java/com/example/demo/mapper/ProductMapper.java
+++ b/src/main/java/com/example/demo/mapper/ProductMapper.java
@@ -19,4 +19,7 @@ public interface ProductMapper {
             "select * from product"
     })
     public List<Product> findAll(Product product);
+
+    // 查询消费表的所有商品名称
+    List<String> findAllProductName();
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
index 975e75d..c535bfe 100644
--- a/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/ProductServiceImpl.java
@@ -32,4 +32,9 @@ public class ProductServiceImpl implements ProductService {
     public List<Index> findIndex(Index index) {
         return productMapper.findIndex(index);
     }
+
+    @Override
+    public List<String> findAllProductName() {
+        return productMapper.findAllProductName();
+    }
 }
diff --git a/src/main/java/com/example/demo/sevice/ProductService.java b/src/main/java/com/example/demo/sevice/ProductService.java
index f1438f3..548559f 100644
--- a/src/main/java/com/example/demo/sevice/ProductService.java
+++ b/src/main/java/com/example/demo/sevice/ProductService.java
@@ -10,4 +10,7 @@ public interface ProductService {
     int add(Product product);
     List<Product> findAll(Product product);
     List<Index> findIndex(Index index);
+
+        //查询 消费表的商品名
+    List<String> findAllProductName();
 }
diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml
index b55e839..3cd0266 100644
--- a/src/main/resources/mapper/ConsumeMapper.xml
+++ b/src/main/resources/mapper/ConsumeMapper.xml
@@ -31,7 +31,7 @@
         SELECT
         detail_y.*,
         admin.name AS adminName,
-        product.name AS productName
+       /* product.name AS productName*/
         FROM detail_y
         LEFT JOIN `admin` ON detail_y.admin_id = admin.admin_id
         LEFT JOIN `user` ON detail_y.jwcode = user.jwcode
diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml
index 91b896b..c0f4183 100644
--- a/src/main/resources/mapper/ProductMapper.xml
+++ b/src/main/resources/mapper/ProductMapper.xml
@@ -10,4 +10,9 @@
     <select id="findIndex" resultType="com.example.demo.domain.entity.Index">
         SELECT * FROM `index` WHERE type = #{type}
     </select>
+
+    <!--查询消费表的商品名-->
+    <select id="findAllProductName" resultType="java.lang.String">
+        select DISTINCT product_name from detail_y
+    </select>
 </mapper>
\ No newline at end of file

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 3/3] =?UTF-8?q?4.27bug=E4=BF=AE=E6=94=B9=20=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E9=87=91=E5=B8=81=E7=BB=9F=E8=AE=A1=EF=BC=8C=E6=B6=88?=
 =?UTF-8?q?=E8=B4=B9=E6=98=8E=E7=BB=86=E5=95=86=E5=93=81=E5=90=8D=E6=9F=A5?=
 =?UTF-8?q?=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