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 findAll(Product product); + + // 查询消费表的所有商品名称 + List 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 findIndex(Index index) { return productMapper.findIndex(index); } + + @Override + public List 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 findAll(Product product); List findIndex(Index index); + + //查询 消费表的商品名 + List 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 @@ + + + \ No newline at end of file