From be8c77e80e818a6bf71ef990f789390cda778198 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Mon, 23 Jun 2025 17:19:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E8=B4=B9=E9=87=91=E5=B8=81=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/example/demo/domain/vo/Consume.java | 5 +++++ src/main/java/com/example/demo/domain/vo/Gold.java | 5 ++++- src/main/resources/mapper/ConsumeMapper.xml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/domain/vo/Consume.java b/src/main/java/com/example/demo/domain/vo/Consume.java index 6dc01b2..45429eb 100644 --- a/src/main/java/com/example/demo/domain/vo/Consume.java +++ b/src/main/java/com/example/demo/domain/vo/Consume.java @@ -19,6 +19,11 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor public class Consume implements Serializable { + + private static final long serialVersionUID = 1L; + private Integer pageNum; //页数 + private Integer pageSize; //页面大小 + private String name; // 客户姓名 private Integer jwcode; // 精网号 private String market; // 所属地区 diff --git a/src/main/java/com/example/demo/domain/vo/Gold.java b/src/main/java/com/example/demo/domain/vo/Gold.java index 64f5ea1..a38a574 100644 --- a/src/main/java/com/example/demo/domain/vo/Gold.java +++ b/src/main/java/com/example/demo/domain/vo/Gold.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** * @program: gold-java * @ClassName Gold @@ -16,7 +18,8 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class Gold { +public class Gold implements Serializable { + private static final long serialVersionUID = 1L; private Integer permanentGolds; // 永久金币总数 private Integer freeGolds; // 免费金币总数 private Integer taskGolds; // 任务金币总数 diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index 51c54f9..af128e0 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -24,6 +24,6 @@ JOIN admin a ON ugr.admin_id = a.id WHERE - ugr.type = 2 + ugr.type = 1 \ No newline at end of file From 99a0b0f800918120b755a69f5e372adcd1482e4d Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 24 Jun 2025 11:11:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E8=B4=B9=E8=AF=A6=E6=83=85=E5=88=86=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E5=95=86=E5=93=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/ConsumeController.java | 16 +++++++++++++--- .../com/example/demo/controller/GeneralController.java | 6 ++++++ src/main/java/com/example/demo/domain/vo/Consume.java | 2 -- src/main/java/com/example/demo/domain/vo/Page.java | 1 + src/main/java/com/example/demo/mapper/GeneralMapper.java | 1 + .../java/com/example/demo/service/ConsumeService.java | 4 +++- .../java/com/example/demo/service/GeneralService.java | 1 + .../com/example/demo/serviceImpl/ConsumeServiceImpl.java | 7 +++++-- .../com/example/demo/serviceImpl/GeneralServiceImpl.java | 6 ++++++ src/main/resources/mapper/GeneralMapper.xml | 3 +++ 10 files changed, 39 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index ba12bcf..8091107 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/ConsumeController.java @@ -2,11 +2,13 @@ package com.example.demo.controller; import com.example.demo.domain.vo.Consume; import com.example.demo.domain.vo.Gold; +import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; import com.example.demo.service.ConsumeService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.ObjectUtils; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -32,10 +34,18 @@ public class ConsumeController { //消耗明细 @PostMapping("/selectAll") - public Result selcetAll() + public Result selcetAll(@RequestBody Page page) { - List consumes = consumeService.selectAll(); - return Result.success(consumes); + if(ObjectUtils.isEmpty(page.getPageNum())){ + return Result.error("页码数为空！"); + } + if(ObjectUtils.isEmpty(page.getPageSize())){ + return Result.error("页大小为空！"); + } + else{ + return Result.success(consumeService.selectAll(page.getPageNum(), page.getPageSize())); + } + } //消耗金币统计 diff --git a/src/main/java/com/example/demo/controller/GeneralController.java b/src/main/java/com/example/demo/controller/GeneralController.java index a7ae932..f22a320 100644 --- a/src/main/java/com/example/demo/controller/GeneralController.java +++ b/src/main/java/com/example/demo/controller/GeneralController.java @@ -41,4 +41,10 @@ public class GeneralController { List list = generalService.getPlatform(); return Result.success(list); } + @PostMapping("/goods") + public Result getGoods() + { + List list = generalService.getGoods(); + return Result.success(list); + } } diff --git a/src/main/java/com/example/demo/domain/vo/Consume.java b/src/main/java/com/example/demo/domain/vo/Consume.java index 45429eb..c3482e2 100644 --- a/src/main/java/com/example/demo/domain/vo/Consume.java +++ b/src/main/java/com/example/demo/domain/vo/Consume.java @@ -21,8 +21,6 @@ import java.util.Date; public class Consume implements Serializable { private static final long serialVersionUID = 1L; - private Integer pageNum; //页数 - private Integer pageSize; //页面大小 private String name; // 客户姓名 private Integer jwcode; // 精网号 diff --git a/src/main/java/com/example/demo/domain/vo/Page.java b/src/main/java/com/example/demo/domain/vo/Page.java index 36d7d9d..ebcc338 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/Page.java @@ -19,5 +19,6 @@ public class Page { private Integer pageNum; private Integer pageSize; private GoldDetail goldDetail; + private Consume consume; } diff --git a/src/main/java/com/example/demo/mapper/GeneralMapper.java b/src/main/java/com/example/demo/mapper/GeneralMapper.java index aca7d39..8913458 100644 --- a/src/main/java/com/example/demo/mapper/GeneralMapper.java +++ b/src/main/java/com/example/demo/mapper/GeneralMapper.java @@ -16,4 +16,5 @@ import java.util.List; public interface GeneralMapper { List getMarket(); List getPlatform(); + List getGoods(); } diff --git a/src/main/java/com/example/demo/service/ConsumeService.java b/src/main/java/com/example/demo/service/ConsumeService.java index 7c52636..3219d50 100644 --- a/src/main/java/com/example/demo/service/ConsumeService.java +++ b/src/main/java/com/example/demo/service/ConsumeService.java @@ -3,6 +3,8 @@ package com.example.demo.service; import com.example.demo.domain.vo.Consume; import com.example.demo.domain.vo.Gold; +import com.example.demo.domain.vo.GoldDetail; +import com.github.pagehelper.PageInfo; import java.util.List; @@ -16,7 +18,7 @@ import java.util.List; **/ public interface ConsumeService { - List selectAll(); + PageInfo selectAll(Integer pageNum, Integer pageSize); Gold statsGold(); } diff --git a/src/main/java/com/example/demo/service/GeneralService.java b/src/main/java/com/example/demo/service/GeneralService.java index 530bc15..479be34 100644 --- a/src/main/java/com/example/demo/service/GeneralService.java +++ b/src/main/java/com/example/demo/service/GeneralService.java @@ -14,4 +14,5 @@ import java.util.List; public interface GeneralService { List getMarket(); List getPlatform(); + List getGoods(); } diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 0aa9b33..36decaf 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -4,6 +4,8 @@ import com.example.demo.domain.vo.Consume; import com.example.demo.domain.vo.Gold; import com.example.demo.mapper.ConsumeMapper; import com.example.demo.service.ConsumeService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,9 +28,10 @@ public class ConsumeServiceImpl implements ConsumeService { //消耗明细 @Override - public List selectAll() { + public PageInfo selectAll(Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum, pageSize); List consumes = consumeMapper.selectAll(); - return consumes; + return new PageInfo<>(consumes); } //消耗金币统计 diff --git a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java index 5c6d8b5..311e218 100644 --- a/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java @@ -32,4 +32,10 @@ public class GeneralServiceImpl implements GeneralService { List list = generalMapper.getPlatform(); return list; } + + @Override + public List getGoods() { + List list = generalMapper.getGoods(); + return list; + } } diff --git a/src/main/resources/mapper/GeneralMapper.xml b/src/main/resources/mapper/GeneralMapper.xml index 73522f5..99103e2 100644 --- a/src/main/resources/mapper/GeneralMapper.xml +++ b/src/main/resources/mapper/GeneralMapper.xml @@ -8,4 +8,7 @@ + \ No newline at end of file From 9ad7f3af694953d345ca7dbcaf3d67ef82e18d3c Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Tue, 24 Jun 2025 13:27:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E7=AD=9B=E9=80=89=E6=9F=A5=E8=AF=A2=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/controller/ConsumeController.java | 27 +++++--- .../java/com/example/demo/domain/vo/Consume.java | 18 ++++-- .../com/example/demo/mapper/ConsumeMapper.java | 2 + .../com/example/demo/service/ConsumeService.java | 2 + .../demo/serviceImpl/ConsumeServiceImpl.java | 8 +++ src/main/resources/mapper/ConsumeMapper.xml | 73 ++++++++++++++++------ 6 files changed, 96 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/example/demo/controller/ConsumeController.java b/src/main/java/com/example/demo/controller/ConsumeController.java index 8091107..6a45db4 100644 --- a/src/main/java/com/example/demo/controller/ConsumeController.java +++ b/src/main/java/com/example/demo/controller/ConsumeController.java @@ -34,24 +34,35 @@ public class ConsumeController { //消耗明细 @PostMapping("/selectAll") - public Result selcetAll(@RequestBody Page page) - { - if(ObjectUtils.isEmpty(page.getPageNum())){ + public Result selcetAll(@RequestBody Page page) { + if (ObjectUtils.isEmpty(page.getPageNum())) { return Result.error("页码数为空！"); } - if(ObjectUtils.isEmpty(page.getPageSize())){ + if (ObjectUtils.isEmpty(page.getPageSize())) { return Result.error("页大小为空！"); - } - else{ + } else { return Result.success(consumeService.selectAll(page.getPageNum(), page.getPageSize())); } } + //消耗明细筛选 + @PostMapping("/selectBy") + public Result selcetBy(@RequestBody Page page) { + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } else { + return Result.success(consumeService.selectBy(page.getPageNum(), page.getPageSize(), page.getConsume())); + } + + } + //消耗金币统计 @PostMapping("/statsGold") - public Result statsGold() - { + public Result statsGold() { Gold gold = consumeService.statsGold(); return Result.success(gold); } diff --git a/src/main/java/com/example/demo/domain/vo/Consume.java b/src/main/java/com/example/demo/domain/vo/Consume.java index c3482e2..90c3a00 100644 --- a/src/main/java/com/example/demo/domain/vo/Consume.java +++ b/src/main/java/com/example/demo/domain/vo/Consume.java @@ -1,18 +1,20 @@ package com.example.demo.domain.vo; + import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; + import java.io.Serializable; import java.util.Date; /** -@program: gold-java -@ClassName Consume -@description: 消费明细 -@author: Double -@create: 2025−06-23 11:53 -@Version 1.0 + * @program: gold-java + * @ClassName Consume + * @description: 消费明细 + * @author: Double + * @create: 2025−06-23 11:53 + * @Version 1.0 **/ @Data @@ -36,4 +38,8 @@ public class Consume implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date payTime; // 消费时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date startTime; // 开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date endTime; // 结束时间 } diff --git a/src/main/java/com/example/demo/mapper/ConsumeMapper.java b/src/main/java/com/example/demo/mapper/ConsumeMapper.java index 505111e..98402a0 100644 --- a/src/main/java/com/example/demo/mapper/ConsumeMapper.java +++ b/src/main/java/com/example/demo/mapper/ConsumeMapper.java @@ -18,4 +18,6 @@ import java.util.List; public interface ConsumeMapper { List selectAll(); + + List selectBy(Consume consume); } diff --git a/src/main/java/com/example/demo/service/ConsumeService.java b/src/main/java/com/example/demo/service/ConsumeService.java index 3219d50..2b144b6 100644 --- a/src/main/java/com/example/demo/service/ConsumeService.java +++ b/src/main/java/com/example/demo/service/ConsumeService.java @@ -21,4 +21,6 @@ public interface ConsumeService { PageInfo selectAll(Integer pageNum, Integer pageSize); Gold statsGold(); + + PageInfo selectBy(Integer pageNum, Integer pageSize, Consume consume); } diff --git a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java index 36decaf..8dc06fc 100644 --- a/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/ConsumeServiceImpl.java @@ -68,4 +68,12 @@ public class ConsumeServiceImpl implements ConsumeService { return gold; } + + //消耗明细筛选 + @Override + public PageInfo selectBy(Integer pageNum, Integer pageSize, Consume consume) { + PageHelper.startPage(pageNum, pageSize); + List consumes = consumeMapper.selectBy(consume); + return new PageInfo<>(consumes); + } } diff --git a/src/main/resources/mapper/ConsumeMapper.xml b/src/main/resources/mapper/ConsumeMapper.xml index af128e0..3f286cc 100644 --- a/src/main/resources/mapper/ConsumeMapper.xml +++ b/src/main/resources/mapper/ConsumeMapper.xml @@ -4,26 +4,59 @@ + + + \ No newline at end of file