From b8085e0416b22cf3ed591f8b21c3ecaecff2f3e9 Mon Sep 17 00:00:00 2001 From: 77 <77@77.com> Date: Mon, 25 Mar 2024 20:52:18 +0800 Subject: [PATCH] init --- .../controller/app/AccountAppController.java | 85 +++++++++++++++++++ .../controller/app/InviteAppController.java | 13 --- .../xq/controller/app/UserAppController.java | 14 --- .../controller/app/WithdrawAppController.java | 1 - .../controller/app/WxTransAppController.java | 26 ------ .../xq/dto/app/account/AccountDetailVo.java | 30 +++++++ .../{user/vo => account}/AccountInfoVO.java | 2 +- .../dto/app/withdraw/WithdrawListAppVo.java | 20 ----- .../xq/mapper/AccountChangeLogMapper.java | 1 + .../com/ruoyi/xq/mapper/UserExtendMapper.java | 2 + .../xq/service/AccountChangeLogService.java | 3 + .../ruoyi/xq/service/UserExtendService.java | 2 +- .../impl/AccountChangeLogServiceImpl.java | 60 +++++++++++++ .../service/impl/UserExtendServiceImpl.java | 1 + .../java/com/ruoyi/xq/util/PageConvert.java | 26 ++++++ .../resources/mapper/xq/UserExtendMapper.xml | 1 - 16 files changed, 210 insertions(+), 77 deletions(-) create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java delete mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/AccountDetailVo.java rename ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/{user/vo => account}/AccountInfoVO.java (91%) create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/util/PageConvert.java diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java new file mode 100644 index 0000000..1b8205b --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/AccountAppController.java @@ -0,0 +1,85 @@ +package com.ruoyi.xq.controller.app; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.domain.PageModel; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.helper.LoginHelper; +import com.ruoyi.xq.domain.UserExtend; +import com.ruoyi.xq.domain.WxTransOrder; +import com.ruoyi.xq.dto.app.account.AccountDetailVo; +import com.ruoyi.xq.dto.app.account.AccountInfoVO; +import com.ruoyi.xq.dto.app.pay.OrderCreateVo; +import com.ruoyi.xq.dto.app.wxtrans.GenWxTransOrderReq; +import com.ruoyi.xq.dto.app.wxtrans.WxTransPriceAppVo; +import com.ruoyi.xq.enums.common.SystemConfigEnum; +import com.ruoyi.xq.manager.SystemConfigManager; +import com.ruoyi.xq.service.AccountChangeLogService; +import com.ruoyi.xq.service.UserExtendService; +import com.ruoyi.xq.service.WxTransOrderService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.math.BigDecimal; + +@RestController +@RequestMapping("/api/account") +@Tag(name = "账户管理") +public class AccountAppController { + @Autowired + private UserExtendService userExtendService; + @Autowired + private AccountChangeLogService accountChangeLogService; + @Autowired + private WxTransOrderService wxTransOrderService; + @Autowired + private SystemConfigManager systemConfigManager; + + @GetMapping("/info") + @Operation(summary = "当前用户信息的账户余额情况") + @Log(title = "当前用户信息的账户余额情况", businessType = BusinessType.OTHER, isSaveDb = false) + public R accountInfo(){ + UserExtend userExtend = userExtendService.getByUserId(LoginHelper.getUserId()); + AccountInfoVO accountInfoVO = new AccountInfoVO(); + accountInfoVO.setUserId(userExtend.getUserId()); + accountInfoVO.setIncomeCoin(userExtend.getIncomeCoin()); + accountInfoVO.setWxTransNum(userExtend.getWxTransNum()); + return R.ok(accountInfoVO); + } + + @GetMapping("/detail/page") + @Operation(summary = "查询账户明细") + @Log(title = "查询账户明细", businessType = BusinessType.OTHER, isSaveDb = false) + public R> detail(PageQuery pageQuery){ + Page page = accountChangeLogService.pageApp(pageQuery,LoginHelper.getUserId()); + return R.ok(PageModel.build(page)); + } + + @GetMapping("/wxTrans/price") + @Operation(summary = "获取微信交换单价") + @Log(title = "获取微信交换单价", businessType = BusinessType.OTHER, isSaveDb = false) + public R getPrice(){ + WxTransPriceAppVo vo = new WxTransPriceAppVo(); + BigDecimal price = systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.WX_TRANS_PRICE); + vo.setPrice(price); + return R.ok(vo); + } + + @PostMapping("/wxTrans/order/create") + @Operation(summary = "生成微信交换订单") + @Log(title = "生成微信交换订单", businessType = BusinessType.OTHER, isSaveDb = false) + public R createVipOrder(@RequestBody GenWxTransOrderReq req){ + Long userId = LoginHelper.getUserId(); + WxTransOrder vipOrder = wxTransOrderService.createVipOrder(userId, req.getWxTransNum()); + OrderCreateVo result = new OrderCreateVo(); + result.setPrice(vipOrder.getWxPrice()); + result.setOrderNo(vipOrder.getOrderNo()); + result.setOrderName(vipOrder.getOrderName()); + return R.ok(result); + } + +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java deleted file mode 100644 index 2a27960..0000000 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/InviteAppController.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ruoyi.xq.controller.app; - -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/api/invite") -@Tag(name = "邀请推广接口") -public class InviteAppController { - - -} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java index 80804a3..c06d059 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/UserAppController.java @@ -3,11 +3,8 @@ package com.ruoyi.xq.controller.app; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.xq.domain.UserExtend; import com.ruoyi.xq.dto.app.common.IdsReq; import com.ruoyi.xq.dto.app.user.*; -import com.ruoyi.xq.dto.app.user.vo.AccountInfoVO; import com.ruoyi.xq.dto.app.user.vo.CurrentUserFullInfoVo; import com.ruoyi.xq.dto.app.user.vo.CurrentUserInfoVo; import com.ruoyi.xq.dto.app.user.vo.UserAuthInfoVo; @@ -39,17 +36,6 @@ public class UserAppController { return R.ok(vo); } - @GetMapping("/user/account/info") - @Operation(summary = "当前用户信息的账户余额情况") - @Log(title = "当前用户信息的账户余额情况", businessType = BusinessType.OTHER, isSaveDb = false) - public R accountInfo(){ - UserExtend userExtend = userExtendService.getByUserId(LoginHelper.getUserId()); - AccountInfoVO accountInfoVO = new AccountInfoVO(); - accountInfoVO.setUserId(userExtend.getUserId()); - accountInfoVO.setIncomeCoin(userExtend.getIncomeCoin()); - accountInfoVO.setWxTransNum(userExtend.getWxTransNum()); - return R.ok(accountInfoVO); - } @GetMapping("/user/query/fullInfo") @Operation(summary = "当前用户的详细信息") diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java index 08356e3..75e7c7e 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WithdrawAppController.java @@ -45,7 +45,6 @@ public class WithdrawAppController { return R.ok(result); } - @PostMapping("/save") @Operation(summary = "申请提现") @Log(title = "申请提现", businessType = BusinessType.OTHER, isSaveDb = false) diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WxTransAppController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WxTransAppController.java index 5d5a07b..e588452 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WxTransAppController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/app/WxTransAppController.java @@ -23,31 +23,5 @@ import java.math.BigDecimal; @Tag(name = "微信交换接口") public class WxTransAppController { - @Autowired - private WxTransOrderService wxTransOrderService; - @Autowired - private SystemConfigManager systemConfigManager; - @GetMapping("/get/price") - @Operation(summary = "获取微信交换单价") - @Log(title = "获取微信交换单价", businessType = BusinessType.OTHER, isSaveDb = false) - public R getPrice(){ - WxTransPriceAppVo vo = new WxTransPriceAppVo(); - BigDecimal price = systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.WX_TRANS_PRICE); - vo.setPrice(price); - return R.ok(vo); - } - - @PostMapping("/order/create") - @Operation(summary = "生成微信交换订单") - @Log(title = "生成微信交换订单", businessType = BusinessType.OTHER, isSaveDb = false) - public R createVipOrder(@RequestBody GenWxTransOrderReq req){ - Long userId = LoginHelper.getUserId(); - WxTransOrder vipOrder = wxTransOrderService.createVipOrder(userId, req.getWxTransNum()); - OrderCreateVo result = new OrderCreateVo(); - result.setPrice(vipOrder.getWxPrice()); - result.setOrderNo(vipOrder.getOrderNo()); - result.setOrderName(vipOrder.getOrderName()); - return R.ok(result); - } } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/AccountDetailVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/AccountDetailVo.java new file mode 100644 index 0000000..2b3d444 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/AccountDetailVo.java @@ -0,0 +1,30 @@ +package com.ruoyi.xq.dto.app.account; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.math.BigDecimal; +import java.time.LocalDate; +import java.time.LocalDateTime; + +@Data +public class AccountDetailVo { + @Schema(description = "用户ID") + private Long userId; + @Schema(description = "用户编号") + private String usercode; + @Schema(description = "来源的用户ID") + private Long sourceUserId; + @Schema(description = "来源的用户昵称") + private String sourceNickname; + @Schema(description = "来源的头像") + private String sourceImg; + @Schema(description = "标题分类") + private String title; + @Schema(description = "内容") + private String content; + @Schema(description = "创建时间") + private LocalDateTime createTime; + @Schema(description = "金额") + private BigDecimal value; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/AccountInfoVO.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/AccountInfoVO.java similarity index 91% rename from ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/AccountInfoVO.java rename to ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/AccountInfoVO.java index 9d553b4..98fafef 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/AccountInfoVO.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/account/AccountInfoVO.java @@ -1,4 +1,4 @@ -package com.ruoyi.xq.dto.app.user.vo; +package com.ruoyi.xq.dto.app.account; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/withdraw/WithdrawListAppVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/withdraw/WithdrawListAppVo.java index e9c5eb5..4327fe2 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/withdraw/WithdrawListAppVo.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/withdraw/WithdrawListAppVo.java @@ -31,26 +31,6 @@ public class WithdrawListAppVo { */ @Schema(description = "提现金额") private BigDecimal withdrawMoney; - /** - * 真实提现金额 - */ - @Schema(description = "真实提现金额") - private BigDecimal realWithdrawMoney; - /** - * 提现手续费金额 - */ - @Schema(description = "提现手续费金额") - private BigDecimal withdrawFees; - /** - * 提现手续费 - */ - @Schema(description = "提现手续费") - private BigDecimal withdrawFeesCate; - /** - * 是否打款 - */ - @Schema(description = "是否打款") - private Integer pay; /** * 1-待审核 2-审核成功 3-审核失败 */ diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AccountChangeLogMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AccountChangeLogMapper.java index b99431e..3406033 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AccountChangeLogMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/AccountChangeLogMapper.java @@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Param; public interface AccountChangeLogMapper extends BaseMapper { Page pageAdmin(@Param("build") Page build, @Param("bo") AccountChangeLogAdminVo bo); + } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserExtendMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserExtendMapper.java index 17c710d..06c8f9c 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserExtendMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserExtendMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.xq.domain.UserExtend; import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo; +import com.ruoyi.xq.dto.app.account.AccountDetailVo; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; @@ -28,4 +29,5 @@ public interface UserExtendMapper extends BaseMapper { boolean incsConsumeTotal(@Param("userId") Long userId, @Param("consumeMonty") BigDecimal consumeMonty); + } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AccountChangeLogService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AccountChangeLogService.java index 65ac1dc..c93a2cd 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AccountChangeLogService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/AccountChangeLogService.java @@ -8,6 +8,7 @@ import com.ruoyi.xq.domain.AccountChangeLog; import com.ruoyi.xq.domain.User; import com.ruoyi.xq.dto.admin.log.AccountChangeLogAdminVo; import com.ruoyi.xq.dto.admin.user.req.UpdateIncomeCoinReq; +import com.ruoyi.xq.dto.app.account.AccountDetailVo; import com.ruoyi.xq.enums.user.AccountChangeCodeEnum; import java.math.BigDecimal; @@ -27,4 +28,6 @@ public interface AccountChangeLogService extends IService { void saveLogAdminOfSystem(User user, AccountChangeCodeEnum accountChangeCodeEnum, UpdateIncomeCoinReq bo, LoginUser loginUser); Page pageAdmin(PageQuery pageQuery, AccountChangeLogAdminVo bo); + + Page pageApp(PageQuery pageQuery, Long userId); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserExtendService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserExtendService.java index eac223c..e5ac45c 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserExtendService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserExtendService.java @@ -8,6 +8,7 @@ import com.ruoyi.xq.domain.UserExtend; import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo; import com.ruoyi.xq.dto.admin.user.req.UpdateIncomeCoinReq; import com.ruoyi.xq.dto.admin.user.req.UpdateWxTransNumReq; +import com.ruoyi.xq.dto.app.account.AccountDetailVo; import com.ruoyi.xq.enums.user.AccountChangeCodeEnum; import java.math.BigDecimal; @@ -38,5 +39,4 @@ public interface UserExtendService extends IService { UserExtend getByUserId(Long id); - } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java index 7c5f6b6..0644e82 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/AccountChangeLogServiceImpl.java @@ -1,5 +1,8 @@ package com.ruoyi.xq.service.impl; +import cn.hutool.core.util.PageUtil; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.PageQuery; @@ -8,17 +11,20 @@ import com.ruoyi.xq.domain.AccountChangeLog; import com.ruoyi.xq.domain.User; import com.ruoyi.xq.dto.admin.log.AccountChangeLogAdminVo; import com.ruoyi.xq.dto.admin.user.req.UpdateIncomeCoinReq; +import com.ruoyi.xq.dto.app.account.AccountDetailVo; import com.ruoyi.xq.dto.common.user.MinUser; import com.ruoyi.xq.enums.user.AccountCateEnum; import com.ruoyi.xq.enums.user.AccountChangeCodeEnum; import com.ruoyi.xq.mapper.AccountChangeLogMapper; import com.ruoyi.xq.service.AccountChangeLogService; import com.ruoyi.xq.service.UserService; +import com.ruoyi.xq.util.PageConvert; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -124,5 +130,59 @@ public class AccountChangeLogServiceImpl extends ServiceImpl pageApp(PageQuery pageQuery, Long userId) { + Page page = this.page(pageQuery.build(), + Wrappers.lambdaQuery(AccountChangeLog.class).eq(AccountChangeLog::getUserId, userId).orderByDesc(AccountChangeLog::getCreateTime)); + List records = page.getRecords(); + if(CollectionUtils.isEmpty(records)){ + return PageConvert.convertEmpty(page); + } + List userIds = new ArrayList<>(); + for (AccountChangeLog record : records) { + if(record.getTarUserId() != null){ + userIds.add(record.getTarUserId()); + } + } + List usersList = userService.listByIds(userIds); + Map userMap = usersList.stream().collect(Collectors.toMap(User::getId, Function.identity())); + List vos = new ArrayList<>(); + for (AccountChangeLog record : records) { + AccountDetailVo vo = new AccountDetailVo(); + vo.setUserId(record.getUserId()); + vo.setUsercode(record.getUsercode()); + vo.setCreateTime(record.getCreateTime()); + vo.setValue(record.getChangeValue()); + User user = userMap.get(record.getTarUserId()); + if(user != null){ + vo.setSourceUserId(user.getId()); + vo.setSourceNickname(user.getNickname()); + vo.setSourceImg(user.getAvatar()); + } + AccountChangeCodeEnum accountChangeCodeEnum = AccountChangeCodeEnum.getByCode(record.getChangeType()); + if(accountChangeCodeEnum != null){ + AccountCateEnum cate = accountChangeCodeEnum.getCate(); + vo.setTitle(cate.getText()); + switch (cate){ + case SYSTEM_TRANS: + double price = record.getChangeValue().doubleValue(); + String content = String.format("系统调整手动%s收益: %s", price > 0 ? "新增" : "减少", price); + vo.setContent(content); + break; + case WITHDRAW: + vo.setContent(accountChangeCodeEnum.getText()); + break; + case AWARD_INVITE: + vo.setContent(accountChangeCodeEnum.getText()); + break; + default: + break; + } + } + vos.add(vo); + } + return PageConvert.convert(page,vos); + } + } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java index b89401a..97e6f5a 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java @@ -14,6 +14,7 @@ import com.ruoyi.xq.domain.WxTransOrder; import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo; import com.ruoyi.xq.dto.admin.user.req.UpdateIncomeCoinReq; import com.ruoyi.xq.dto.admin.user.req.UpdateWxTransNumReq; +import com.ruoyi.xq.dto.app.account.AccountDetailVo; import com.ruoyi.xq.enums.common.OrderTypeEnum; import com.ruoyi.xq.enums.common.SystemConfigEnum; import com.ruoyi.xq.enums.consumer.ConsumerTypeEnum; diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/util/PageConvert.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/util/PageConvert.java new file mode 100644 index 0000000..f7aa789 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/util/PageConvert.java @@ -0,0 +1,26 @@ +package com.ruoyi.xq.util; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.Data; + +import java.util.List; + +@Data +public class PageConvert { + public static Page convertEmpty(Page page){ + Page result = new Page<>(); + result.setTotal(page.getTotal()); + result.setCurrent(page.getCurrent()); + result.setSize(page.getSize()); + return result; + } + + public static Page convert(Page page, List record){ + Page result = new Page<>(); + result.setTotal(page.getTotal()); + result.setRecords(record); + result.setCurrent(page.getCurrent()); + result.setSize(page.getSize()); + return result; + } +} diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml index 41b790d..8213bd5 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml @@ -47,5 +47,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t1.id desc -