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] =?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