From 904f96170b970f2101a3c26ed53d9a818eac4220 Mon Sep 17 00:00:00 2001 From: huangqizhen <15552608129@163.com> Date: Sun, 20 Apr 2025 11:45:09 +0800 Subject: [PATCH] =?UTF-8?q?4.18=20=20=E5=AE=8C=E6=88=90=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/DouController.java | 16 +++ src/main/java/com/example/demo/domain/dou/Pay.java | 3 + .../java/com/example/demo/domain/dou/Spend.java | 5 +- .../com/example/demo/mapperLink/DouMapper.java | 3 + .../example/demo/serviceImpl/DouServiceImpl.java | 28 ++++- .../java/com/example/demo/sevice/DouService.java | 5 + src/main/resources/mapperLink/DouMapper.xml | 135 ++++++++++++++++----- 7 files changed, 162 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/example/demo/controller/DouController.java b/src/main/java/com/example/demo/controller/DouController.java index 1ad6cd0..8429aa5 100644 --- a/src/main/java/com/example/demo/controller/DouController.java +++ b/src/main/java/com/example/demo/controller/DouController.java @@ -94,4 +94,20 @@ public class DouController { public Result getRechargeTotal(@RequestBody RechargeTotal rechargeTotal){ return Result.success(douService.getRechargeTotal(rechargeTotal)); } + @RequestMapping("/SearchPay") + public Result SearchPay(@RequestBody Page page){ + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.success(douService.SearchPay(page.getPay())); + } else { + return Result.success(douService.SearchPay(page.getPageNum(), page.getPageSize(), page.getPay())); + } + } + @RequestMapping("/SearchStyle") + public Result SearchStyle(){ + return Result.success(douService.SearchStyle()); + } + @RequestMapping("/SearchPayIp") + public Result SearchPayIp(){ + return Result.success(douService.SearchPayIp()); + } } diff --git a/src/main/java/com/example/demo/domain/dou/Pay.java b/src/main/java/com/example/demo/domain/dou/Pay.java index 3e93079..b13aa20 100644 --- a/src/main/java/com/example/demo/domain/dou/Pay.java +++ b/src/main/java/com/example/demo/domain/dou/Pay.java @@ -27,6 +27,9 @@ public class Pay { private String name; private String deptName; private String shopName; + private Integer money; + private Integer moneyFree; + private Integer moneyBuy; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; diff --git a/src/main/java/com/example/demo/domain/dou/Spend.java b/src/main/java/com/example/demo/domain/dou/Spend.java index de00de3..9d9eb2d 100644 --- a/src/main/java/com/example/demo/domain/dou/Spend.java +++ b/src/main/java/com/example/demo/domain/dou/Spend.java @@ -28,12 +28,13 @@ public class Spend implements Serializable { private String sourceName; private String content; private Integer payType; - private Integer sourceType; - private Integer time; + private Integer good; + private Integer createTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; + private String room; } diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java index b646678..e3fb481 100644 --- a/src/main/java/com/example/demo/mapperLink/DouMapper.java +++ b/src/main/java/com/example/demo/mapperLink/DouMapper.java @@ -16,5 +16,8 @@ public interface DouMapper { List getIp(); List getSpend(Spend spend); Integer getSpendTotal(SpendTotal spendTotal); + List getPay(Pay pay); + List getPayIp(); + RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal); } diff --git a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java index 6789af9..0825de2 100644 --- a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java @@ -127,18 +127,18 @@ public class DouServiceImpl implements DouService { @Override public List getPayIp() { - return payMapper.getPayIp(); + return douMapper.getPayIp(); } @Override public List getPay(Pay pay) { - return payMapper.getPay(pay); + return douMapper.getPay(pay); } @Override public Object searchPay(Integer pageNum, Integer pageSize, Pay pay) { PageHelper.startPage(pageNum, pageSize); - List list= payMapper.getPay(pay); + List list= douMapper.getPay(pay); return new PageInfo<>(list); } @@ -163,4 +163,26 @@ public class DouServiceImpl implements DouService { public RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal) { return payMapper.getRechargeTotal(rechargeTotal); } + + @Override + public List SearchPay(Pay pay) { + return payMapper.getPay(pay); + } + + @Override + public List SearchStyle() { + return payMapper.getStyle(); + } + + @Override + public List SearchPayIp() { + return payMapper.getPayIp(); + } + + @Override + public Object SearchPay(Integer pageNum, Integer pageSize, Pay pay) { + PageHelper.startPage(pageNum, pageSize); + List list= payMapper.getPay(pay); + return new PageInfo<>(list); + } } diff --git a/src/main/java/com/example/demo/sevice/DouService.java b/src/main/java/com/example/demo/sevice/DouService.java index e10a629..0dbfdf9 100644 --- a/src/main/java/com/example/demo/sevice/DouService.java +++ b/src/main/java/com/example/demo/sevice/DouService.java @@ -23,4 +23,9 @@ public interface DouService { Object searchSpend(Integer pageNum, Integer pageSize, Spend spend); Integer getSpendTotal(SpendTotal spendTotal); RechargeTotal getRechargeTotal(RechargeTotal rechargeTotal); + List SearchPay(Pay pay); + List SearchStyle(); + List SearchPayIp(); + Object SearchPay(Integer pageNum, Integer pageSize, Pay pay); + } diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml index d887aef..6d95301 100644 --- a/src/main/resources/mapperLink/DouMapper.xml +++ b/src/main/resources/mapperLink/DouMapper.xml @@ -75,20 +75,63 @@ SELECT DISTINCT ip_address FROM fx_member WHERE ip_address is not null + + - + select DISTINCT ip_address from fx_member WHERE ip_address is not null + + - \ No newline at end of file