From 595895d472d775dab5b251870c8a7606b5cd90ae Mon Sep 17 00:00:00 2001 From: lijianlin Date: Tue, 25 Nov 2025 11:52:31 +0800 Subject: [PATCH] =?UTF-8?q?11-25=20=E5=B0=8F=E9=BB=84=E8=BD=A6=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/bean/BeanConsumeController.java | 2 +- .../demo/domain/DTO/BeanConsumeCartDTO.java | 45 ++++++++++++++++++++++ .../demo/domain/vo/bean/BeanConsumeCartVo.java | 9 +++-- .../java/com/example/demo/domain/vo/coin/Page.java | 3 ++ .../demo/mapper/coin/BeanRechargeMapper1.java | 3 +- .../demo/service/bean/BeanConsumeService.java | 3 +- .../serviceImpl/bean/BeanConsumeServiceImpl.java | 7 +++- src/main/resources/mapper/BeanRechargeMapper1.xml | 32 ++++++++++++++- 8 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java index ac4d7c7..3506db5 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java @@ -122,7 +122,7 @@ public class BeanConsumeController { return Result.error("页大小为空！"); } else { - return Result.success(beanConsumeService.selectCartBy(page.getPageNum(), page.getPageSize(), page.getBeanConsumeCart())); + return Result.success(beanConsumeService.selectCartBy(page.getPageNum(), page.getPageSize(), page.getBeanConsumeCartDTO())); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java b/src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java new file mode 100644 index 0000000..ce0767c --- /dev/null +++ b/src/main/java/com/example/demo/domain/DTO/BeanConsumeCartDTO.java @@ -0,0 +1,45 @@ +package com.example.demo.domain.DTO; + +import com.alibaba.excel.annotation.ExcelIgnore; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * @program: gold-java + * @ClassName BeanConsumeCartDTO + * @description: + * @author: Ethan + * @create: 2025−11-25 09:59 + * @Version 1.0 + **/ +@Data +@NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class BeanConsumeCartDTO implements Serializable { + private Integer id; + private String nickname; // 姓名 + private Integer jwcode; // 精网号 + // private Integer productId; // 产品 ID + private String productName; //产品名称 + private String market; //用户地区 + //private BigDecimal totalMoney; // 金额 + private String liveName; // 直播间名称 + private String sourceName; // 班级或频道名称 + @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; + private Long createdAt; // 创建时间 + private String startAt; //时间戳开始时间 + private String endAt; //时间戳结束时间 + + private String sortField; //排序字段 + + private String sortOrder; //排序顺序 +} diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java index 4cac6f4..edc915c 100644 --- a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCartVo.java @@ -5,8 +5,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Date; /** * @program: gold-java @@ -19,7 +21,7 @@ import java.time.LocalDateTime; @Data @NoArgsConstructor @JsonIgnoreProperties(ignoreUnknown = true) -public class BeanConsumeCartVo { +public class BeanConsumeCartVo implements Serializable { private Integer id; private String nickname; // 姓名 private Integer jwcode; // 精网号 @@ -29,7 +31,6 @@ public class BeanConsumeCartVo { private BigDecimal totalMoney; // 应付金额 private String liveName; // 直播间名称 private String sourceName; // 班级或频道名称 - - private Long tradeTime; // 支付成功时间 - private Long createdAt; // 创建时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createdAt; // 创建时间 } diff --git a/src/main/java/com/example/demo/domain/vo/coin/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java index 257764e..2097aa2 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -1,5 +1,6 @@ package com.example.demo.domain.vo.coin; +import com.example.demo.domain.DTO.BeanConsumeCartDTO; import com.example.demo.domain.entity.User; import com.example.demo.domain.vo.bean.*; import com.example.demo.domain.vo.cash.CashCollection; @@ -37,6 +38,7 @@ public class Page { private BeanConsumeFan beanConsumeFan; //铁粉金豆消费 private BeanConsumeArticle beanConsumeArticle; //文章金豆消费 private BeanConsumeCart beanConsumeCart; //小黄车金豆消费 + private BeanConsumeCartDTO beanConsumeCartDTO; //小黄车dto private BeanSystemRechargeInfo beanSystemRechargeInfo; //金豆充值信息 private BeanOnlineRechargeInfo beanOnlineRechargeInfo; //金豆充值信息 private BeanConsumeGold beanConsumeGold; //金豆消费合计数 @@ -49,4 +51,5 @@ public class Page { private RechargeActivity rechargeActivity; //充值活动 private CashRecordDTO cashRecordDTO; + } diff --git a/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java b/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java index bf9b774..703db58 100644 --- a/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java +++ b/src/main/java/com/example/demo/mapper/coin/BeanRechargeMapper1.java @@ -1,6 +1,7 @@ package com.example.demo.mapper.coin; +import com.example.demo.domain.DTO.BeanConsumeCartDTO; import com.example.demo.domain.vo.bean.BeanConsumeCart; import com.example.demo.domain.vo.bean.BeanConsumeCartVo; import com.example.demo.domain.vo.bean.BeanRecharge; @@ -20,6 +21,6 @@ import java.util.List; @Mapper public interface BeanRechargeMapper1 { //筛选查询小黄车消费 - List selectCartBy(BeanConsumeCart beanConsumeCart); + List selectCartBy(BeanConsumeCartDTO beanConsumeCartDTO); int add(BeanRecharge recharge); } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java index 96f0836..fcec04c 100644 --- a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java +++ b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java @@ -1,5 +1,6 @@ package com.example.demo.service.bean; +import com.example.demo.domain.DTO.BeanConsumeCartDTO; import com.example.demo.domain.vo.bean.*; import com.example.demo.domain.vo.coin.Gold; import com.example.demo.domain.vo.coin.Page; @@ -37,5 +38,5 @@ public interface BeanConsumeService { List getLiveChannel(); //筛选查询小黄车消费 - Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart); + Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCartDTO beanConsumeCartDTO); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index af68734..bc4d7d4 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -1,6 +1,7 @@ package com.example.demo.serviceImpl.bean; import com.example.demo.Util.BaseDES2; +import com.example.demo.domain.DTO.BeanConsumeCartDTO; import com.example.demo.domain.vo.bean.*; import com.example.demo.domain.vo.coin.*; import com.example.demo.mapper.bean.BeanConsumeMapper; @@ -195,9 +196,11 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { } //筛选查询小黄车消费 @Override - public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) { + public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCartDTO beanConsumeCartDTO) { + PageHelper.startPage(pageNum, pageSize); //必须要直接跟mapper - List beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCart); + List beanConsumeCarts = beanRechargeMapper1.selectCartBy(beanConsumeCartDTO); + return new PageInfo<>(beanConsumeCarts); } @Override diff --git a/src/main/resources/mapper/BeanRechargeMapper1.xml b/src/main/resources/mapper/BeanRechargeMapper1.xml index fc1c229..5469861 100644 --- a/src/main/resources/mapper/BeanRechargeMapper1.xml +++ b/src/main/resources/mapper/BeanRechargeMapper1.xml @@ -29,10 +29,40 @@ \ No newline at end of file