lywsvip/likeadmin_java
1
0
Fork 0
mirror of https://gitee.com/likeadmin/likeadmin_java.git synced 2026-06-03 07:32:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeadmin/likeadmin_java into develop

Browse Source
This commit is contained in:
damonyuan
2024-10-15 01:11:02 +08:00
parent 51061ad76b 6e9cb97582
commit b4ad8bb3a7
57 changed files with 646 additions and 622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/like-front/src/main/java/com/mdd/front/service/impl/ArticleServiceImpl.java
View File

@@ -83,8 +83,8 @@ public class ArticleServiceImpl implements IArticleService {
*/
@Override
public PageResult<ArticleListedVo> list( Integer userId, PageValidate pageValidate, ArticleSearchValidate searchValidate) {
Integer pageNo = pageValidate.getPageNo();
Integer pageSize = pageValidate.getPageSize();
Integer pageNo = pageValidate.getPage_no();
Integer pageSize = pageValidate.getPage_size();
QueryWrapper<Article> queryWrapper = new QueryWrapper<>();
queryWrapper.select("id,title,image,intro,visit,create_time");
@@ -196,8 +196,8 @@ public class ArticleServiceImpl implements IArticleService {
*/
@Override
public PageResult<ArticleCollectVo> collect(PageValidate pageValidate, Integer userId) {
Integer pageNo = pageValidate.getPageNo();
Integer pageSize = pageValidate.getPageSize();
Integer pageNo = pageValidate.getPage_no();
Integer pageSize = pageValidate.getPage_size();
MPJQueryWrapper<ArticleCollect> mpjQueryWrapper = new MPJQueryWrapper<>();
mpjQueryWrapper.select("t.id,t.article_id,a.title,a.image,a.intro,a.visit,a.create_time")

16
server/like-front/src/main/java/com/mdd/front/service/impl/LogsServiceImpl.java
View File

@@ -4,9 +4,9 @@ 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.log.LogMoney;
import com.mdd.common.entity.log.UserAccountLog;
import com.mdd.common.enums.LogMoneyEnum;
import com.mdd.common.mapper.log.LogMoneyMapper;
import com.mdd.common.mapper.log.UserAccountLogMapper;
import com.mdd.common.util.TimeUtils;
import com.mdd.front.service.ILogsService;
import com.mdd.front.validate.common.PageValidate;
@@ -21,24 +21,24 @@ import java.util.List;
public class LogsServiceImpl implements ILogsService {
@Resource
LogMoneyMapper logMoneyMapper;
UserAccountLogMapper userAccountLogMapper;
@Override
public PageResult<RechargeRecordVo> userMoney(PageValidate pageValidate, Integer userId, Integer type) {
Integer pageNo = pageValidate.getPageNo();
Integer pageSize = pageValidate.getPageSize();
Integer pageNo = pageValidate.getPage_no();
Integer pageSize = pageValidate.getPage_size();
QueryWrapper<LogMoney> queryWrapper = new QueryWrapper<>();
QueryWrapper<UserAccountLog> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", userId);
queryWrapper.orderByDesc("id");
if (type > 0) {
queryWrapper.eq("action", type);
}
IPage<LogMoney> iPage = logMoneyMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
IPage<UserAccountLog> iPage = userAccountLogMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
List<RechargeRecordVo> list = new LinkedList<>();
for (LogMoney logMoney : iPage.getRecords()) {
for (UserAccountLog logMoney : iPage.getRecords()) {
RechargeRecordVo vo = new RechargeRecordVo();
vo.setId(logMoney.getId());

4
server/like-front/src/main/java/com/mdd/front/service/impl/PayServiceImpl.java
View File

@@ -11,7 +11,7 @@ import com.mdd.common.enums.LogMoneyEnum;
import com.mdd.common.enums.PaymentEnum;
import com.mdd.common.exception.OperateException;
import com.mdd.common.exception.PaymentException;
import com.mdd.common.mapper.log.LogMoneyMapper;
import com.mdd.common.mapper.log.UserAccountLogMapper;
import com.mdd.common.mapper.RechargeOrderMapper;
import com.mdd.common.mapper.setting.DevPayConfigMapper;
import com.mdd.common.mapper.setting.DevPayWayMapper;
@@ -53,7 +53,7 @@ public class PayServiceImpl implements IPayService {
RechargeOrderMapper rechargeOrderMapper;
@Resource
LogMoneyMapper logMoneyMapper;
UserAccountLogMapper logMoneyMapper;
/**
* 支付方式

4
server/like-front/src/main/java/com/mdd/front/service/impl/RechargeServiceImpl.java
View File

@@ -67,8 +67,8 @@ public class RechargeServiceImpl implements IRechargeService {
*/
@Override
public PageResult<RechargeRecordVo> record(Integer userId, PageValidate pageValidate) {
Integer pageNo = pageValidate.getPageNo();
Integer pageSize = pageValidate.getPageSize();
Integer pageNo = pageValidate.getPage_no();
Integer pageSize = pageValidate.getPage_size();
QueryWrapper<RechargeOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("user_id", userId);

4
server/like-front/src/main/java/com/mdd/front/validate/common/PageValidate.java
View File

@@ -15,11 +15,11 @@ public class PageValidate implements Serializable {
// 当前分页
@DecimalMin(value = "1", message = "pageNo参数必须大于0的数字")
public Integer pageNo = 1;
public Integer page_no = 1;
// 每页条数
@DecimalMin(value = "1", message = "pageSize参数必须是大于0的数字")
@DecimalMax(value = "60", message = "pageSize参数必须是小于60的数字")
private Integer pageSize = 20;
private Integer page_size = 20;
}