From 9a6f8128ac003b4a49fc1bc8b721c4b96395c833 Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Wed, 22 Mar 2023 19:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=94=AF=E4=BB=98=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mdd/common/enums/ClientEnum.java | 3 - .../com/mdd/common/enums/LogMoneyEnum.java | 16 +++++ .../mdd/front/controller/LogsController.java | 35 +++++++++++ .../front/controller/RechargeController.java | 4 +- .../mdd/front/controller/UserController.java | 1 - .../com/mdd/front/service/ILogsService.java | 14 +++++ .../mdd/front/service/IRechargeService.java | 4 +- .../service/impl/ArticleServiceImpl.java | 2 +- .../front/service/impl/LogsServiceImpl.java | 58 +++++++++++++++++++ .../service/impl/RechargeServiceImpl.java | 12 ++-- .../com/mdd/front/vo/LogRecordDataVo.java | 29 ++++++++++ .../com/mdd/front/vo/RechargeRecordVo.java | 26 --------- 12 files changed, 163 insertions(+), 41 deletions(-) create mode 100644 server/like-front/src/main/java/com/mdd/front/controller/LogsController.java create mode 100644 server/like-front/src/main/java/com/mdd/front/service/ILogsService.java create mode 100644 server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java create mode 100644 server/like-front/src/main/java/com/mdd/front/vo/LogRecordDataVo.java delete mode 100644 server/like-front/src/main/java/com/mdd/front/vo/RechargeRecordVo.java diff --git a/server/like-common/src/main/java/com/mdd/common/enums/ClientEnum.java b/server/like-common/src/main/java/com/mdd/common/enums/ClientEnum.java index 0ef808a1..7cd0681c 100644 --- a/server/like-common/src/main/java/com/mdd/common/enums/ClientEnum.java +++ b/server/like-common/src/main/java/com/mdd/common/enums/ClientEnum.java @@ -70,9 +70,6 @@ public enum ClientEnum { return null; } - - - /** * 获取状态码 * diff --git a/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java b/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java index aa1b2f10..9094a5b0 100644 --- a/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java +++ b/server/like-common/src/main/java/com/mdd/common/enums/LogMoneyEnum.java @@ -40,4 +40,20 @@ public enum LogMoneyEnum { return this.msg; } + /** + * 根据编码获取Msg + * + * @author fzr + * @param code 类型 + * @return String + */ + public static String getMsgByCode(Integer code){ + for(ClientEnum enumItem: ClientEnum.values()) { + if (enumItem.getCode() == code) { + return enumItem.getMsg(); + } + } + return null; + } + } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java b/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java new file mode 100644 index 00000000..07131f15 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/controller/LogsController.java @@ -0,0 +1,35 @@ +package com.mdd.front.controller; + +import com.mdd.common.core.AjaxResult; +import com.mdd.common.core.PageResult; +import com.mdd.front.service.ILogsService; +import com.mdd.front.validate.common.PageValidate; +import com.mdd.front.vo.LogRecordDataVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@RestController +@RequestMapping("/api/logs") +@Api(tags = "日志管理") +public class LogsController { + + @Resource + ILogsService iLogsService; + + @GetMapping("/userMoney") + @ApiOperation("用户金额变动日志") + public AjaxResult userMoney(@Validated PageValidate pageValidate, + @RequestParam(defaultValue = "0") Integer type) { + + PageResult list = iLogsService.userMoney(pageValidate, type); + return AjaxResult.success(list); + } + +} diff --git a/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java b/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java index 5acdfcd3..ef30000f 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/RechargeController.java @@ -6,7 +6,7 @@ import com.mdd.front.LikeFrontThreadLocal; import com.mdd.front.service.IRechargeService; import com.mdd.front.validate.RechargeValidate; import com.mdd.front.validate.common.PageValidate; -import com.mdd.front.vo.RechargeRecordVo; +import com.mdd.front.vo.LogRecordDataVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.annotation.Validated; @@ -28,7 +28,7 @@ public class RechargeController { public AjaxResult record(@Validated PageValidate pageValidate) { Integer userId = LikeFrontThreadLocal.getUserId(); - PageResult list = iRechargeService.record(userId, pageValidate); + PageResult list = iRechargeService.record(userId, pageValidate); return AjaxResult.success(list); } diff --git a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java index 2550d89f..a09dc461 100644 --- a/server/like-front/src/main/java/com/mdd/front/controller/UserController.java +++ b/server/like-front/src/main/java/com/mdd/front/controller/UserController.java @@ -113,5 +113,4 @@ public class UserController { return AjaxResult.success(); } - } diff --git a/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java b/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java new file mode 100644 index 00000000..b5eb1baa --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/service/ILogsService.java @@ -0,0 +1,14 @@ +package com.mdd.front.service; + +import com.mdd.common.core.PageResult; +import com.mdd.front.validate.common.PageValidate; +import com.mdd.front.vo.LogRecordDataVo; + +/** + * 日志接口服务类 + */ +public interface ILogsService { + + PageResult userMoney(PageValidate pageValidate, Integer type); + +} diff --git a/server/like-front/src/main/java/com/mdd/front/service/IRechargeService.java b/server/like-front/src/main/java/com/mdd/front/service/IRechargeService.java index 70faec2e..7a2ea607 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/IRechargeService.java +++ b/server/like-front/src/main/java/com/mdd/front/service/IRechargeService.java @@ -3,7 +3,7 @@ package com.mdd.front.service; import com.mdd.common.core.PageResult; import com.mdd.front.validate.RechargeValidate; import com.mdd.front.validate.common.PageValidate; -import com.mdd.front.vo.RechargeRecordVo; +import com.mdd.front.vo.LogRecordDataVo; import java.util.Map; @@ -19,7 +19,7 @@ public interface IRechargeService { * @param pageValidate 分页参数 * @return PageResult */ - PageResult record(Integer userId, PageValidate pageValidate); + PageResult record(Integer userId, PageValidate pageValidate); /** * 充值下单 diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java index d24fae9c..0657769e 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java @@ -143,7 +143,7 @@ public class ArticleServiceImpl implements IArticleService { } } - return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); } /** diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java new file mode 100644 index 00000000..d1212cd7 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java @@ -0,0 +1,58 @@ +package com.mdd.front.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.mdd.common.core.PageResult; +import com.mdd.common.entity.LogMoney; +import com.mdd.common.entity.article.Article; +import com.mdd.common.enums.LogMoneyEnum; +import com.mdd.common.mapper.LogMoneyMapper; +import com.mdd.common.util.TimeUtils; +import com.mdd.common.util.UrlUtils; +import com.mdd.front.service.ILogsService; +import com.mdd.front.validate.common.PageValidate; +import com.mdd.front.vo.LogRecordDataVo; +import com.mdd.front.vo.article.ArticleListedVo; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.LinkedList; +import java.util.List; + +@Service +public class LogsServiceImpl implements ILogsService { + + @Resource + LogMoneyMapper logMoneyMapper; + + @Override + public PageResult userMoney(PageValidate pageValidate, Integer type) { + Integer pageNo = pageValidate.getPageNo(); + Integer pageSize = pageValidate.getPageSize(); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.orderByDesc("id"); + if (type > 0) { + queryWrapper.eq("action", type); + } + + IPage iPage = logMoneyMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); + + List list = new LinkedList<>(); + for (LogMoney logMoney : iPage.getRecords()) { + LogRecordDataVo vo = new LogRecordDataVo(); + + vo.setId(logMoney.getId()); + vo.setAction(logMoney.getAction()); + vo.setOrderAmount(logMoney.getChangeAmount()); + vo.setTips(LogMoneyEnum.getMsgByCode(logMoney.getChangeType())); + vo.setCreateTime(TimeUtils.timestampToDate(vo.getCreateTime())); + list.add(vo); + } + + return PageResult.iPageHandle(iPage.getTotal(), iPage.getCurrent(), iPage.getSize(), list); + } + +} diff --git a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java index 4f87d75b..b7049e1a 100644 --- a/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java +++ b/server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java @@ -8,11 +8,10 @@ import com.mdd.common.entity.RechargeOrder; import com.mdd.common.enums.PaymentEnum; import com.mdd.common.mapper.RechargeOrderMapper; import com.mdd.common.util.TimeUtils; -import com.mdd.common.util.ToolUtils; import com.mdd.front.service.IRechargeService; import com.mdd.front.validate.RechargeValidate; import com.mdd.front.validate.common.PageValidate; -import com.mdd.front.vo.RechargeRecordVo; +import com.mdd.front.vo.LogRecordDataVo; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -39,7 +38,7 @@ public class RechargeServiceImpl implements IRechargeService { * @return PageResult */ @Override - public PageResult record(Integer userId, PageValidate pageValidate) { + public PageResult record(Integer userId, PageValidate pageValidate) { Integer pageNo = pageValidate.getPageNo(); Integer pageSize = pageValidate.getPageSize(); @@ -50,12 +49,13 @@ public class RechargeServiceImpl implements IRechargeService { IPage iPage = rechargeOrderMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper); - List list = new LinkedList<>(); + List list = new LinkedList<>(); for (RechargeOrder rechargeOrder : iPage.getRecords()) { - RechargeRecordVo vo = new RechargeRecordVo(); + LogRecordDataVo vo = new LogRecordDataVo(); vo.setId(rechargeOrder.getId()); + vo.setAction(1); vo.setOrderAmount(rechargeOrder.getOrderAmount()); - vo.setPayTime(TimeUtils.timestampToDate(rechargeOrder.getPayTime())); + vo.setCreateTime(TimeUtils.timestampToDate(rechargeOrder.getPayTime())); vo.setTips("充值" + vo.getOrderAmount() + "元"); list.add(vo); } diff --git a/server/like-front/src/main/java/com/mdd/front/vo/LogRecordDataVo.java b/server/like-front/src/main/java/com/mdd/front/vo/LogRecordDataVo.java new file mode 100644 index 00000000..0798e645 --- /dev/null +++ b/server/like-front/src/main/java/com/mdd/front/vo/LogRecordDataVo.java @@ -0,0 +1,29 @@ +package com.mdd.front.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +@Data +@ApiModel(value = "日志记录Vo") +public class LogRecordDataVo implements Serializable { + + @ApiModelProperty(value = "ID") + private Integer id; + + @ApiModelProperty(value = "金额") + private BigDecimal orderAmount; + + @ApiModelProperty(value = "描述") + private String tips; + + @ApiModelProperty(value = "操作") + private Integer action; + + @ApiModelProperty(value = "时间") + private String createTime; + +} diff --git a/server/like-front/src/main/java/com/mdd/front/vo/RechargeRecordVo.java b/server/like-front/src/main/java/com/mdd/front/vo/RechargeRecordVo.java deleted file mode 100644 index e6de6ac1..00000000 --- a/server/like-front/src/main/java/com/mdd/front/vo/RechargeRecordVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.mdd.front.vo; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - -@Data -@ApiModel(value = "充值记录Vo") -public class RechargeRecordVo implements Serializable { - - @ApiModelProperty(value = "订单ID") - private Integer id; - - @ApiModelProperty(value = "充值金额") - private BigDecimal orderAmount; - - @ApiModelProperty(value = "充值描述") - private String tips; - - @ApiModelProperty(value = "充值时间") - private String payTime; - -}