From 01c813137b046ce76eef3bf655597bfcd096031d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Wed, 13 Mar 2024 15:45:03 +0800 Subject: [PATCH] init --- .../xq/controller/UserExtendController.java | 36 +++-------------- .../xq/controller/UserInviteController.java | 5 ++- .../xq/dto/admin/user/UserInviteAdminVo.java | 15 +++++++ .../admin/user/req/UpdateIncomeCoinReq.java | 16 ++++++++ .../com/ruoyi/xq/mapper/UserExtendMapper.java | 2 + .../com/ruoyi/xq/mapper/UserInviteMapper.java | 4 ++ .../ruoyi/xq/service/UserExtendService.java | 3 ++ .../ruoyi/xq/service/UserInviteService.java | 5 +++ .../service/impl/UserExtendServiceImpl.java | 22 +++++++++- .../service/impl/UserInviteServiceImpl.java | 8 ++++ .../resources/mapper/xq/UserExtendMapper.xml | 5 +++ .../resources/mapper/xq/UserInviteMapper.xml | 40 ++++++++++++++----- 12 files changed, 118 insertions(+), 43 deletions(-) create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserInviteAdminVo.java create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateIncomeCoinReq.java diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java index 3fca402..cf3de02 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java @@ -13,6 +13,7 @@ import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; 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.service.UserExtendService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -59,38 +60,13 @@ public class UserExtendController extends BaseController { return R.ok(userExtendService.getById(id)); } - /** - * 新增用户邀请 - */ - @SaCheckPermission("xq:userExtend:add") - @Log(title = "用户邀请", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody UserExtend bo) { - return toAjax(userExtendService.save(bo)); - } - - /** - * 修改用户邀请 - */ @SaCheckPermission("xq:userExtend:edit") - @Log(title = "用户邀请", businessType = BusinessType.UPDATE) + @Log(title = "调整用户收益", businessType = BusinessType.UPDATE) @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody UserExtend bo) { - return toAjax(userExtendService.updateById(bo)); + @PostMapping("/updateIncomeCoin") + public R updateIncomeCoin(@RequestBody UpdateIncomeCoinReq bo) { + userExtendService.updateIncomeCoin(bo); + return R.ok(); } - /** - * 删除用户邀请 - * - * @param ids 主键串 - */ - @SaCheckPermission("xq:userExtend:remove") - @Log(title = "用户邀请", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(userExtendService.removeBatchByIds(Arrays.asList(ids))); - } } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInviteController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInviteController.java index e320550..75e11d7 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInviteController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInviteController.java @@ -13,6 +13,7 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.UserInvite; +import com.ruoyi.xq.dto.admin.user.UserInviteAdminVo; import com.ruoyi.xq.service.UserInviteService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -41,8 +42,8 @@ public class UserInviteController extends BaseController { */ @SaCheckPermission("xq:userInvite:list") @GetMapping("/list") - public TableDataInfo list(UserInvite bo, PageQuery pageQuery) { - Page page = userInviteService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(UserInviteAdminVo bo, PageQuery pageQuery) { + Page page = userInviteService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserInviteAdminVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserInviteAdminVo.java new file mode 100644 index 0000000..80fba3a --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserInviteAdminVo.java @@ -0,0 +1,15 @@ +package com.ruoyi.xq.dto.admin.user; + +import com.ruoyi.xq.domain.UserInvite; +import lombok.Data; + +@Data +public class UserInviteAdminVo extends UserInvite { + private String avatar; + private String nickname; + private String mobile; + + private String inviteMobile; + private String inviteAvatar; + private String inviteNickname; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateIncomeCoinReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateIncomeCoinReq.java new file mode 100644 index 0000000..d648a40 --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateIncomeCoinReq.java @@ -0,0 +1,16 @@ +package com.ruoyi.xq.dto.admin.user.req; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class UpdateIncomeCoinReq { + private String usercode; + private String remark; + + /** + * 调整的金额 + */ + private BigDecimal rechargeCoin; +} 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 8fc8869..706fe1d 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 @@ -18,5 +18,7 @@ public interface UserExtendMapper extends BaseMapper { boolean decrIncome(@Param("userId") Long userId, @Param("price") BigDecimal price); + boolean incrIncome(@Param("userId") Long userId, @Param("price") BigDecimal price); + Page pageAdmin(@Param("build") Page build, @Param("bo") UserExtendAdminVo bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserInviteMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserInviteMapper.java index 5dff88e..0dedc9b 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserInviteMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserInviteMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.xq.domain.UserInvite; +import com.ruoyi.xq.dto.admin.user.UserInviteAdminVo; +import org.apache.ibatis.annotations.Param; /** * 用户邀请Mapper接口 @@ -11,4 +14,5 @@ import com.ruoyi.xq.domain.UserInvite; */ public interface UserInviteMapper extends BaseMapper { + Page pageAdmin(@Param("build") Page build, @Param("bo") UserInviteAdminVo bo); } 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 6cad0d3..8d31430 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.UserExtend; import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo; +import com.ruoyi.xq.dto.admin.user.req.UpdateIncomeCoinReq; import java.math.BigDecimal; @@ -19,4 +20,6 @@ public interface UserExtendService extends IService { boolean withdraw(Long userId, BigDecimal withdrawPrice); Page pageAdmin(PageQuery pageQuery, UserExtendAdminVo bo); + + void updateIncomeCoin(UpdateIncomeCoinReq bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInviteService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInviteService.java index 9b4b27a..e4b11ae 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInviteService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInviteService.java @@ -1,7 +1,10 @@ package com.ruoyi.xq.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.UserInvite; +import com.ruoyi.xq.dto.admin.user.UserInviteAdminVo; /** * 用户邀请Service接口 @@ -14,4 +17,6 @@ public interface UserInviteService extends IService { void bindInvite(Long userId, String inviteCode); void unBindInviteUser(Long userId); + + Page pageAdmin(PageQuery pageQuery, UserInviteAdminVo bo); } 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 8e4f3c4..a7e6b91 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 @@ -3,12 +3,18 @@ package com.ruoyi.xq.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.xq.domain.User; 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.mapper.UserExtendMapper; import com.ruoyi.xq.service.UserExtendService; +import com.ruoyi.xq.service.UserService; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; @@ -21,7 +27,8 @@ import java.math.BigDecimal; @RequiredArgsConstructor @Service public class UserExtendServiceImpl extends ServiceImpl implements UserExtendService { - + @Autowired + private UserService userService; @Override public boolean withdraw(Long userId, BigDecimal withdrawPrice){ @@ -34,4 +41,17 @@ public class UserExtendServiceImpl extends ServiceImpl pageAdmin(PageQuery pageQuery, UserInviteAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(), bo); + } } diff --git a/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml index f72d693..6d6fede 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml @@ -9,6 +9,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set income_coin = income_coin - #{price} where income_coin - #{price} > 0 and user_id = #{userId} + + update xq_user_extend + set income_coin = income_coin + #{price} + where income_coin + #{price} > 0 and user_id = #{userId} + + select + t1.*, + t2.nickname, t2.mobile, t2.avatar, + t3.nickname as invite_nickname, t3.mobile as invite_mobile, t3.avatar as invite_avatar + from xq_user_invite t1 + left join xq_user t2 on t1.user_id = t2.id + left join xq_user t3 on t1.invite_id = t3.id + + + and t1.usercode = #{bo.usercode} + + + and t2.nickname like concat('%',#{bo.nickname},'%') + + + and t2.mobile = #{bo.mobile} + + + and t1.usercode = #{bo.inviteCode} + + + and t3.nickname like concat('%',#{bo.inviteNickname},'%') + + + and t3.mobile = #{bo.inviteMobile} + + + order by t1.create_time +