diff --git a/src/main/java/com/example/demo/controller/DouController.java b/src/main/java/com/example/demo/controller/DouController.java index 01e7edf..0935ea2 100644 --- a/src/main/java/com/example/demo/controller/DouController.java +++ b/src/main/java/com/example/demo/controller/DouController.java @@ -4,6 +4,7 @@ package com.example.demo.controller; import com.example.demo.domain.dou.Records; import com.example.demo.domain.dou.Searchinfo; +import com.example.demo.domain.dou.SpendTotal; import com.example.demo.domain.dou.YveTotal; import com.example.demo.domain.vo.Page; import com.example.demo.domain.vo.Result; @@ -80,4 +81,16 @@ public class DouController { return Result.success(douService.searchPay(page.getPageNum(), page.getPageSize(), page.getPay())); } } + @RequestMapping("/getSpend") + public Result getSpend(@RequestBody Page page){ + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.success(douService.getSpend(page.getSpend())); + } else { + return Result.success(douService.searchSpend(page.getPageNum(), page.getPageSize(), page.getSpend())); + } + } + @RequestMapping("/getSpendTotal") + public Result getSpendTotal(@RequestBody SpendTotal spendTotal){ + return Result.success(douService.getSpendTotal(spendTotal)); + } } 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 17b968c..3e93079 100644 --- a/src/main/java/com/example/demo/domain/dou/Pay.java +++ b/src/main/java/com/example/demo/domain/dou/Pay.java @@ -1,8 +1,10 @@ package com.example.demo.domain.dou; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; @@ -25,7 +27,13 @@ public class Pay { private String name; private String deptName; private String shopName; + @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 sortField; + private String sortOrder; } 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 4dda1f1..de00de3 100644 --- a/src/main/java/com/example/demo/domain/dou/Spend.java +++ b/src/main/java/com/example/demo/domain/dou/Spend.java @@ -1,10 +1,13 @@ package com.example.demo.domain.dou; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.Date; @Data @NoArgsConstructor @@ -27,4 +30,10 @@ public class Spend implements Serializable { private Integer payType; private Integer sourceType; private Integer time; + @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; } diff --git a/src/main/java/com/example/demo/domain/dou/SpendTotal.java b/src/main/java/com/example/demo/domain/dou/SpendTotal.java new file mode 100644 index 0000000..1d42380 --- /dev/null +++ b/src/main/java/com/example/demo/domain/dou/SpendTotal.java @@ -0,0 +1,27 @@ +package com.example.demo.domain.dou; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SpendTotal { + private String token; + private Integer SpendTotal; + @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 jwcode; + private String sourceName; + private Integer payType; + private String ipAddress; +} 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 ac5752e..8520962 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/Page.java @@ -2,6 +2,7 @@ package com.example.demo.domain.vo; import com.example.demo.domain.dou.Pay; +import com.example.demo.domain.dou.Spend; import com.example.demo.domain.dou.Yve; import com.example.demo.domain.entity.*; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -32,6 +33,7 @@ public class Page implements Serializable { private DetailYgold detailYgold; private Yve yve; private Pay pay; + private Spend spend; } diff --git a/src/main/java/com/example/demo/domain/vo/RechargeVo.java b/src/main/java/com/example/demo/domain/vo/RechargeVo.java index f4e3a0b..1acfa64 100644 --- a/src/main/java/com/example/demo/domain/vo/RechargeVo.java +++ b/src/main/java/com/example/demo/domain/vo/RechargeVo.java @@ -36,7 +36,7 @@ public class RechargeVo implements Serializable { // 实现 Serializable 接口 private Date createTime; private Date startDate; private Date endDate; - private String userName; + private String username; private String activityName; private Integer status; private String reson; diff --git a/src/main/java/com/example/demo/mapperLink/DouMapper.java b/src/main/java/com/example/demo/mapperLink/DouMapper.java index 579f425..b646678 100644 --- a/src/main/java/com/example/demo/mapperLink/DouMapper.java +++ b/src/main/java/com/example/demo/mapperLink/DouMapper.java @@ -15,5 +15,6 @@ public interface DouMapper { YveTotal getYveTotal(YveTotal yveTotal); List getIp(); List getSpend(Spend spend); + Integer getSpendTotal(SpendTotal spendTotal); } diff --git a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java index 8eff4a7..37aee7b 100644 --- a/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/DouServiceImpl.java @@ -141,4 +141,21 @@ public class DouServiceImpl implements DouService { List list= payMapper.getPay(pay); return new PageInfo<>(list); } + + @Override + public List getSpend(Spend spend) { + return douMapper.getSpend(spend); + } + + @Override + public Object searchSpend(Integer pageNum, Integer pageSize, Spend spend) { + PageHelper.startPage(pageNum, pageSize); + List list= douMapper.getSpend(spend); + return new PageInfo<>(list); + } + + @Override + public Integer getSpendTotal(SpendTotal spendTotal) { + return douMapper.getSpendTotal(spendTotal); + } } diff --git a/src/main/java/com/example/demo/sevice/DouService.java b/src/main/java/com/example/demo/sevice/DouService.java index 4bee645..95c6b80 100644 --- a/src/main/java/com/example/demo/sevice/DouService.java +++ b/src/main/java/com/example/demo/sevice/DouService.java @@ -19,4 +19,7 @@ public interface DouService { List getPayIp(); List getPay(Pay pay); Object searchPay(Integer pageNum, Integer pageSize, Pay pay); + List getSpend(Spend spend); + Object searchSpend(Integer pageNum, Integer pageSize, Spend spend); + Integer getSpendTotal(SpendTotal spendTotal); } diff --git a/src/main/resources/mapperLink/DouMapper.xml b/src/main/resources/mapperLink/DouMapper.xml index 67ab7c1..d6a523d 100644 --- a/src/main/resources/mapperLink/DouMapper.xml +++ b/src/main/resources/mapperLink/DouMapper.xml @@ -15,7 +15,7 @@ fy.jinbi_free, fy.jinbi_buy, fy.s1, - COUNT(CASE WHEN fmr.data = 1 THEN 1 END) AS data_1_count, + COUNT(CASE WHEN fmr.data = 1 THEN 1 END) AS number, fm2.nickname AS master_nickname, -- 师傅的昵称 fm2.shop AS master_shop -- 师傅的店铺 FROM fx_member fm @@ -102,11 +102,43 @@ AND fy.pay_type = #{payType} + + and FROM_UNIXTIME(fy.`time`) BETWEEN #{startTime} AND #{endTime} + + + + + ORDER BY ${sortField} ${sortOrder} + + + + + \ No newline at end of file diff --git a/src/main/resources/mapperPay/PayMapper.xml b/src/main/resources/mapperPay/PayMapper.xml index 332e7ed..b838111 100644 --- a/src/main/resources/mapperPay/PayMapper.xml +++ b/src/main/resources/mapperPay/PayMapper.xml @@ -8,25 +8,30 @@ LEFT JOIN member_info as mi on go.jwcode = mi.jwcode LEFT JOIN g_pay_style gps on go.pay_style=gps.id - - go.jwcode = #{jwcode} + + and go.jwcode = #{jwcode} - go.order_no = #{orderNo} + and go.order_no = #{orderNo} - go.type = #{type} + and go.type = #{type} - go.pay_style = #{payStyle} + and go.pay_style = #{payStyle} - mi.deptName = #{deptName} + and mi.deptName = #{deptName} and FROM_UNIXTIME(go.success_time) BETWEEN #{startTime} AND #{endTime} + + + ORDER BY ${sortField} ${sortOrder} + +