From d85e855cbcb2b70318b7175a94c89458d0cf1c15 Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Sun, 31 Dec 2023 18:40:42 +0800 Subject: [PATCH] init --- .../GuardLogController.java} | 19 ++-- .../admin/GuardTotalController.java | 95 ++++++++++++++++++ .../controller/admin/UserGiftController.java | 96 +++++++++++++++++++ .../com/ruoyi/cai/domain/CaiConsumeLog.java | 8 +- .../java/com/ruoyi/cai/domain/GuardLog.java | 6 ++ .../java/com/ruoyi/cai/domain/GuardTotal.java | 4 + .../java/com/ruoyi/cai/domain/UserGift.java | 7 ++ .../ruoyi/cai/mapper/GuardTotalMapper.java | 8 +- .../com/ruoyi/cai/mapper/UserGiftMapper.java | 1 + .../ruoyi/cai/service/GuardTotalService.java | 2 +- .../ruoyi/cai/service/UserGiftService.java | 1 + .../service/impl/GuardTotalServiceImpl.java | 15 ++- .../cai/service/impl/UserGiftServiceImpl.java | 7 ++ .../resources/mapper/cai/GuardTotalMapper.xml | 18 ++-- .../resources/mapper/cai/UserGiftMapper.xml | 2 - 15 files changed, 257 insertions(+), 32 deletions(-) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/{CaiGuardLogController.java => admin/GuardLogController.java} (83%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java similarity index 83% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java index 7747bfb5..3ac4eed0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiGuardLogController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.cai.controller; +package com.ruoyi.cai.controller.admin; import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -26,15 +26,15 @@ import java.util.Arrays; * 守护赠送流水 * * @author 77 - * @date 2023-12-30 + * @date 2023-12-31 */ @Validated @RequiredArgsConstructor @RestController @RequestMapping("/cai/guardLog") -public class CaiGuardLogController extends BaseController { +public class GuardLogController extends BaseController { - private final GuardLogService iGuardLogService; + private final GuardLogService guardLogService; /** * 查询守护赠送流水列表 @@ -42,10 +42,11 @@ public class CaiGuardLogController extends BaseController { @SaCheckPermission("cai:guardLog:list") @GetMapping("/list") public TableDataInfo list(GuardLog bo, PageQuery pageQuery) { - Page page = iGuardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + Page page = guardLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); return TableDataInfo.build(page); } + /** * 获取守护赠送流水详细信息 * @@ -55,7 +56,7 @@ public class CaiGuardLogController extends BaseController { @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { - return R.ok(iGuardLogService.getById(id)); + return R.ok(guardLogService.getById(id)); } /** @@ -66,7 +67,7 @@ public class CaiGuardLogController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody GuardLog bo) { - return toAjax(iGuardLogService.save(bo)); + return toAjax(guardLogService.save(bo)); } /** @@ -77,7 +78,7 @@ public class CaiGuardLogController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody GuardLog bo) { - return toAjax(iGuardLogService.updateById(bo)); + return toAjax(guardLogService.updateById(bo)); } /** @@ -90,6 +91,6 @@ public class CaiGuardLogController extends BaseController { @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) { - return toAjax(iGuardLogService.removeBatchByIds(Arrays.asList(ids), true)); + return toAjax(guardLogService.removeBatchByIds(Arrays.asList(ids))); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java new file mode 100644 index 00000000..79a48334 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GuardTotalController.java @@ -0,0 +1,95 @@ +package com.ruoyi.cai.controller.admin; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.cai.domain.GuardTotal; +import com.ruoyi.cai.service.GuardTotalService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +/** + * 用户守护累计 + * + * @author 77 + * @date 2023-12-31 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/guardTotal") +public class GuardTotalController extends BaseController { + + private final GuardTotalService guardTotalService; + + /** + * 查询用户守护累计列表 + */ + @SaCheckPermission("cai:guardTotal:list") + @GetMapping("/list") + public TableDataInfo list(GuardTotal bo, PageQuery pageQuery) { + Page page = guardTotalService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + return TableDataInfo.build(page); + } + + /** + * 获取用户守护累计详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:guardTotal:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(guardTotalService.getById(id)); + } + + /** + * 新增用户守护累计 + */ + @SaCheckPermission("cai:guardTotal:add") + @Log(title = "用户守护累计", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody GuardTotal bo) { + return toAjax(guardTotalService.save(bo)); + } + + /** + * 修改用户守护累计 + */ + @SaCheckPermission("cai:guardTotal:edit") + @Log(title = "用户守护累计", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody GuardTotal bo) { + return toAjax(guardTotalService.updateById(bo)); + } + + /** + * 删除用户守护累计 + * + * @param ids 主键串 + */ + @SaCheckPermission("cai:guardTotal:remove") + @Log(title = "用户守护累计", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(guardTotalService.removeBatchByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java new file mode 100644 index 00000000..42b46f3e --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserGiftController.java @@ -0,0 +1,96 @@ +package com.ruoyi.cai.controller.admin; + +import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.cai.domain.UserGift; +import com.ruoyi.cai.service.UserGiftService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.common.enums.BusinessType; +import lombok.RequiredArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Arrays; + +/** + * 礼物流水 + * + * @author 77 + * @date 2023-12-31 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/userGift") +public class UserGiftController extends BaseController { + + private final UserGiftService userGiftService; + + /** + * 查询礼物流水列表 + */ + @SaCheckPermission("cai:userGift:list") + @GetMapping("/list") + public TableDataInfo list(UserGift bo, PageQuery pageQuery) { + Page page = userGiftService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UserGift::getCreateTime)); + return TableDataInfo.build(page); + } + + + /** + * 获取礼物流水详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:userGift:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(userGiftService.getById(id)); + } + + /** + * 新增礼物流水 + */ + @SaCheckPermission("cai:userGift:add") + @Log(title = "礼物流水", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody UserGift bo) { + return toAjax(userGiftService.save(bo)); + } + + /** + * 修改礼物流水 + */ + @SaCheckPermission("cai:userGift:edit") + @Log(title = "礼物流水", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody UserGift bo) { + return toAjax(userGiftService.updateById(bo)); + } + + /** + * 删除礼物流水 + * + * @param ids 主键串 + */ + @SaCheckPermission("cai:userGift:remove") + @Log(title = "礼物流水", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(userGiftService.removeBatchByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java index 87315cc7..9c5e4dda 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiConsumeLog.java @@ -46,9 +46,9 @@ public class CaiConsumeLog implements Serializable { */ private Long oneAmount; /** - * 二级金额 + * 工会金额 */ - private Long twoAmount; + private Long unionAmount; /** * 平台金额 */ @@ -125,7 +125,7 @@ public class CaiConsumeLog implements Serializable { /** * 状态 0-待计算分销 1-已计算分销 */ - private String calculateStatus; + private Boolean calculateStatus; /** * 状态 -1-无须分销 0-待分销 1-已分销 */ @@ -133,7 +133,7 @@ public class CaiConsumeLog implements Serializable { /** * 状态 0-否 1-是 */ - private String admin; + private Boolean admin; /** * 管理员ID */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java index 00b6a5a4..493cda9f 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardLog.java @@ -28,14 +28,20 @@ public class GuardLog implements Serializable { * 女神 */ private Long fromUserId; + private String fromUsercode; + private String fromMobile; + /** * 赠送人 */ private Long toUserId; + private String toUsercode; + private String toMobile; /** * 赠送个数 */ private Long guardNum; + private Long guardPrice; /** * 守护值 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java index 8e4a4378..51a14f5b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/GuardTotal.java @@ -28,10 +28,14 @@ public class GuardTotal implements Serializable { * 被守护人的user_id(大咖) */ private Long fromUserId; + private String fromUsercode; + private String fromMobile; /** * 守护人的user_id */ private Long toUserId; + private String toUsercode; + private String toMobile; /** * 累计守护符个数 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java index c3b01a77..89cca001 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/UserGift.java @@ -32,14 +32,21 @@ public class UserGift implements Serializable { * 赠送者 */ private Long fromUid; + private String fromUsercode; + private String fromMobile; /** * 接受者 */ private Long toUid; + private String toUsercode; + private String toMobile; /** * 礼物ID */ private Long giftId; + private String giftImg; + private String giftName; + private Long giftPrice; /** * 礼物数量 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardTotalMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardTotalMapper.java index c6ad0765..f4421e75 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardTotalMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/GuardTotalMapper.java @@ -17,12 +17,12 @@ import java.util.List; */ public interface GuardTotalMapper extends BaseMapper { - List selectGuardTotal(@Param("fromUserId") Long fromUserId, @Param("limit") Integer limit); + List selectGuardTotal(@Param("toUserId") Long toUserId, @Param("limit") Integer limit); void incs(@Param("fromUserId") Long fromUserId, @Param("toUserId") Long toUserId, @Param("guardNum") Long guardNum, @Param("guardValue") Long guardValue); - Long guardCount(@Param("fromUserId") Long fromUserId); - Long guardPersonCount(@Param("fromUserId") Long fromUserId); + Long guardCount(@Param("toUserId") Long toUserId); + Long guardPersonCount(@Param("toUserId") Long toUserId); - Page userGuardPage(@Param("build") Page build, @Param("userId") Long userId); + Page userGuardPage(@Param("build") Page build, @Param("toUserId") Long toUserId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGiftMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGiftMapper.java index a3e3a1da..68fb42a8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGiftMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserGiftMapper.java @@ -18,4 +18,5 @@ public interface UserGiftMapper extends BaseMapper { List selectGiftList(@Param("userId") Long userId); long countGiftNum(@Param("fromUid") Long fromUid, @Param("toUid") Long toUid); + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java index 0800016b..f8155faf 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/GuardTotalService.java @@ -23,5 +23,5 @@ public interface GuardTotalService extends IService { GuardNum getGuardNum(Long fromUserId, Long toUserId); - Page userGuardPage(PageQuery pageQuery, Long userId); + Page userGuardPage(PageQuery pageQuery, Long toUserId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGiftService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGiftService.java index 3ef5e013..0a5d2282 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGiftService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserGiftService.java @@ -18,4 +18,5 @@ public interface UserGiftService extends IService { List selectGiftList(Long userId); boolean giveGift(GiveGiftRes query); + } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java index ae30989b..159d9330 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/GuardTotalServiceImpl.java @@ -96,9 +96,14 @@ public class GuardTotalServiceImpl extends ServiceImpl userGuardPage(PageQuery pageQuery,Long userId) { - return baseMapper.userGuardPage(pageQuery.build(),userId); + public Page userGuardPage(PageQuery pageQuery,Long toUserId) { + return baseMapper.userGuardPage(pageQuery.build(),toUserId); } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java index 43c83209..17856c16 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserGiftServiceImpl.java @@ -61,8 +61,15 @@ public class UserGiftServiceImpl extends ServiceImpl i UserGift userGift = new UserGift(); userGift.setType(query.getType()); userGift.setFromUid(fromUserId); + userGift.setFromMobile(fromUser.getMobile()); + userGift.setFromUsercode(fromUser.getUsercode()); userGift.setToUid(query.getToUserId()); + userGift.setToMobile(toUser.getMobile()); + userGift.setToUsercode(toUser.getUsercode()); userGift.setGiftId(query.getGiftId()); + userGift.setGiftName(gift.getName()); + userGift.setGiftImg(gift.getImg()); + userGift.setGiftPrice(gift.getPrice()); userGift.setGiftCount(query.getGiftCount()); userGift.setGiftAmount(giftAmount); userGift.setConsumerLogId(consumeLog.getId()); diff --git a/ruoyi-cai/src/main/resources/mapper/cai/GuardTotalMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/GuardTotalMapper.xml index 9aa740b7..11c4aa9a 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/GuardTotalMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/GuardTotalMapper.xml @@ -22,8 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ifnull(sum(guard_num),0) from cai_guard_total t1 - join cai_user t2 on t1.to_user_id = t2.id - where t1.from_user_id = #{fromUserId} + join cai_user t2 on t1.from_user_id = t2.id + where t1.to_user_id = #{toUserId} diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserGiftMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserGiftMapper.xml index a9c390fc..ef6a6485 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserGiftMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserGiftMapper.xml @@ -40,6 +40,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - -