diff --git a/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java b/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java new file mode 100644 index 0000000..9943c3b --- /dev/null +++ b/src/main/java/com/example/demo/controller/coin/HistoryRecordController.java @@ -0,0 +1,79 @@ +package com.example.demo.controller.coin; + +import com.example.demo.Util.JWTUtil; +import com.example.demo.domain.entity.Admin; +import com.example.demo.domain.vo.coin.HistoryRecord; +import com.example.demo.domain.vo.coin.Page; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.service.coin.HistoryRecordService; +import jakarta.servlet.http.HttpServletRequest; +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.CrossOrigin; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import java.util.Arrays; +import java.util.List; + +/** + * @program: gold-java + * @ClassName HistoryRecordController + * @description: + * @author: Double + * @create: 2025−08-18 15:32 + * @Version 1.0 + **/ + +@RestController +@RequestMapping("/history") +@RequiredArgsConstructor +@Slf4j +@CrossOrigin +public class HistoryRecordController { + @Autowired + private HistoryRecordService historyRecordService; + + //获取旧的历史记录 + @RequestMapping("/getOldHistoryRecord") + public Result getOldHistoryRecord(Page page){ + try { + //页码校验 + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + //页面大小校验 + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } else { + return Result.success(historyRecordService.getOldHistoryRecord(page.getPageNum(), page.getPageSize(),page.getHistoryRecord())); + } + } catch (Exception e) { + e.printStackTrace(); + return Result.error("请检查筛选数据的格式"); + } + } + //获取新的历史记录 + @RequestMapping("/getNewHistoryRecord") + public Result getNewHistoryRecord(Page page){ + try { + //页码校验 + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + //页面大小校验 + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } else { + return Result.success(historyRecordService.getNewHistoryRecord(page.getPageNum(), page.getPageSize(),page.getHistoryRecord())); + } + } catch (Exception e) { + e.printStackTrace(); + return Result.error("请检查筛选数据的格式"); + } + } +} diff --git a/src/main/java/com/example/demo/domain/vo/coin/HistoryRecord.java b/src/main/java/com/example/demo/domain/vo/coin/HistoryRecord.java index 1aa85c3..3d8d461 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/HistoryRecord.java +++ b/src/main/java/com/example/demo/domain/vo/coin/HistoryRecord.java @@ -32,44 +32,30 @@ public class HistoryRecord implements Serializable { private String name; // 客户姓名 @ExcelProperty("精网号") private Integer jwcode; // 精网号 - @ExcelProperty("所属地区") - private String market; // 所属地区 - @ExcelProperty("商品名称") - private String goodsName; // 商品名称 - @ExcelProperty("消费平台") - private String payPlatform; // 消费平台 - @ExcelProperty("金币总数") - private BigDecimal sumGold; // 金币总数 + @ExcelProperty("数量") + private BigDecimal num; // 数量 + @ExcelProperty("更新类型") + private String updateType; // 更新类型 @ExcelProperty("永久金币") private BigDecimal permanentGold; // 永久金币 @ExcelProperty("免费金币") private BigDecimal freeGold; // 免费金币 @ExcelProperty("任务金币") private BigDecimal taskGold; // 任务金币 + @ExcelProperty("操作人") + private String operator; // 操作人 + @ExcelProperty("更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") + private Date createTime; // 更新时间 @ExcelProperty("备注") private String remark; // 备注 - @ExcelProperty("提交人ID") - private Integer adminId; //提交人Id - @ExcelProperty("提交人姓名") - private String adminName; //提交人姓名 - @ExcelProperty("是否退款") - private Integer isRefund; //是否退款 - @ExcelProperty("消费时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") - private Date createTime; // 消费时间 + + + @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date startTime; // 开始时间 @ExcelIgnore @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date endTime; // 结束时间 - - @ExcelIgnore - private String sortField; //排序字段 - @ExcelIgnore - private String sortOrder; //排序顺序 - @ExcelIgnore - private List markets; // 地区列表 - @ExcelProperty - private Integer flag; //是否为员工号 } 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 7f727a1..5143c69 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 @@ -40,4 +40,5 @@ public class Page { private BeanUser beanUser; //客户金豆余额明细 private BeanUserCard beanUserCard; //客户金豆卡片 private BeanAuditInfo beanAuditInfo; //金豆审核信息 + private HistoryRecord historyRecord; //历史记录 } diff --git a/src/main/java/com/example/demo/mapper/coin/HistoryRecordMapper.java b/src/main/java/com/example/demo/mapper/coin/HistoryRecordMapper.java index 3386cb8..bbb3381 100644 --- a/src/main/java/com/example/demo/mapper/coin/HistoryRecordMapper.java +++ b/src/main/java/com/example/demo/mapper/coin/HistoryRecordMapper.java @@ -2,6 +2,7 @@ package com.example.demo.mapper.coin; import com.example.demo.domain.vo.coin.HistoryRecord; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -14,6 +15,7 @@ import java.util.List; * @Version 1.0 **/ +@Mapper public interface HistoryRecordMapper { //获取旧的历史记录 List getOldHistoryRecord(HistoryRecord historyRecord); diff --git a/src/main/java/com/example/demo/service/coin/HistoryRecordService.java b/src/main/java/com/example/demo/service/coin/HistoryRecordService.java index 937748a..b8f5719 100644 --- a/src/main/java/com/example/demo/service/coin/HistoryRecordService.java +++ b/src/main/java/com/example/demo/service/coin/HistoryRecordService.java @@ -1,6 +1,11 @@ package com.example.demo.service.coin; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.HistoryRecord; +import com.example.demo.domain.vo.coin.Result; +import com.github.pagehelper.PageInfo; + /** @program: gold-java @ClassName HistorySelectService @@ -11,4 +16,8 @@ package com.example.demo.service.coin; **/ public interface HistoryRecordService { + //获取旧的历史记录 + PageInfo getOldHistoryRecord(Integer pageNum, Integer pageSize, HistoryRecord historyRecord); + //获取新的历史记录 + PageInfo getNewHistoryRecord(Integer pageNum, Integer pageSize, HistoryRecord historyRecord); } diff --git a/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java index 1a9728a..837a29c 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/HistoryRecordServiceImpl.java @@ -1,6 +1,16 @@ package com.example.demo.serviceImpl.coin; +import com.example.demo.domain.vo.coin.ConsumeUser; +import com.example.demo.domain.vo.coin.HistoryRecord; +import com.example.demo.domain.vo.coin.Result; +import com.example.demo.mapper.coin.HistoryRecordMapper; import com.example.demo.service.coin.HistoryRecordService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * @program: gold-java @@ -11,6 +21,23 @@ import com.example.demo.service.coin.HistoryRecordService; * @Version 1.0 **/ +@Service public class HistoryRecordServiceImpl implements HistoryRecordService { + @Autowired + private HistoryRecordMapper historyRecordMapper; + + @Override + public PageInfo getOldHistoryRecord(Integer pageNum, Integer pageSize, HistoryRecord historyRecord) { + PageHelper.startPage(pageNum, pageSize); + List historyRecords = historyRecordMapper.getOldHistoryRecord(historyRecord); + return new PageInfo<>(historyRecords); + } + + @Override + public PageInfo getNewHistoryRecord(Integer pageNum, Integer pageSize, HistoryRecord historyRecord) { + PageHelper.startPage(pageNum, pageSize); + List historyRecords = historyRecordMapper.getNewHistoryRecord(historyRecord); + return new PageInfo<>(historyRecords); + } } diff --git a/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml b/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml index 0d0e18c..c1f5eac 100644 --- a/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml +++ b/src/main/resources/sqlServiceMapper/HistoryRecordMapper.xml @@ -1,8 +1,10 @@ + + \ No newline at end of file