diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionController.java new file mode 100644 index 00000000..b7c9030c --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionController.java @@ -0,0 +1,96 @@ +package com.ruoyi.cai.controller; + +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.CaiUnion; +import com.ruoyi.cai.service.CaiUnionService; +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-22 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/userUnion") +public class CaiUnionController extends BaseController { + + private final CaiUnionService caiUnionService; + + /** + * 查询工会列表列表 + */ + @SaCheckPermission("cai:userUnion:list") + @GetMapping("/list") + public TableDataInfo list(CaiUnion bo, PageQuery pageQuery) { + Page page = caiUnionService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + return TableDataInfo.build(page); + } + + + /** + * 获取工会列表详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:userUnion:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(caiUnionService.getById(id)); + } + + /** + * 新增工会列表 + */ + @SaCheckPermission("cai:userUnion:add") + @Log(title = "工会列表", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody CaiUnion bo) { + return toAjax(caiUnionService.save(bo)); + } + + /** + * 修改工会列表 + */ + @SaCheckPermission("cai:userUnion:edit") + @Log(title = "工会列表", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody CaiUnion bo) { + return toAjax(caiUnionService.updateById(bo)); + } + + /** + * 删除工会列表 + * + * @param ids 主键串 + */ + @SaCheckPermission("cai:userUnion:remove") + @Log(title = "工会列表", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(caiUnionService.removeBatchByIds(Arrays.asList(ids))); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionUserController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionUserController.java new file mode 100644 index 00000000..9b3b2d70 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUnionUserController.java @@ -0,0 +1,95 @@ +package com.ruoyi.cai.controller; + +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.CaiUnionUser; +import com.ruoyi.cai.service.CaiUnionUserService; +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; + +/** + * 123 + * + * @author ruoyi + * @date 2023-12-22 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/cai/unionUser") +public class CaiUnionUserController extends BaseController { + + private final CaiUnionUserService caiUnionUserService; + + /** + * 查询123列表 + */ + @SaCheckPermission("cai:unionUser:list") + @GetMapping("/list") + public TableDataInfo list(CaiUnionUser bo, PageQuery pageQuery) { + Page page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + return TableDataInfo.build(page); + } + + /** + * 获取123详细信息 + * + * @param id 主键 + */ + @SaCheckPermission("cai:unionUser:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long id) { + return R.ok(caiUnionUserService.getById(id)); + } + + /** + * 新增123 + */ + @SaCheckPermission("cai:unionUser:add") + @Log(title = "123", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody CaiUnionUser bo) { + return toAjax(caiUnionUserService.save(bo)); + } + + /** + * 修改123 + */ + @SaCheckPermission("cai:unionUser:edit") + @Log(title = "123", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody CaiUnionUser bo) { + return toAjax(caiUnionUserService.updateById(bo)); + } + + /** + * 删除123 + * + * @param ids 主键串 + */ + @SaCheckPermission("cai:unionUser:remove") + @Log(title = "123", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] ids) { + return toAjax(caiUnionUserService.removeBatchByIds(Arrays.asList(ids), true)); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserMemberController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserMemberController.java index 234371d5..aa53d9c4 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserMemberController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/CaiUserMemberController.java @@ -4,6 +4,7 @@ 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.CaiUserMember; +import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; import com.ruoyi.cai.service.CaiUserMemberService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; @@ -41,8 +42,8 @@ public class CaiUserMemberController extends BaseController { */ @SaCheckPermission("cai:userMember:list") @GetMapping("/list") - public TableDataInfo list(CaiUserMember bo, PageQuery pageQuery) { - Page page = userMemberService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(CaiUserMemberAdminVo bo, PageQuery pageQuery) { + Page page = userMemberService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnion.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnion.java new file mode 100644 index 00000000..87e9e072 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnion.java @@ -0,0 +1,63 @@ +package com.ruoyi.cai.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 工会列表对象 cai_union + * + * @author 77 + * @date 2023-12-22 + */ +@Data +@TableName("cai_union") +public class CaiUnion implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * 工会id + */ + @TableId(value = "id") + private Long id; + /** + * 用户id + */ + private Long userId; + /** + * 工会名称 + */ + private String name; + /** + * 0=禁用 1=启用 + */ + private Integer status; + /** + * 工会默认二级支付奖励比例 + */ + private BigDecimal unionPayRate; + /** + * 工会默认二级收益奖励比例 + */ + private BigDecimal unionIncomeRate; + /** + * 全部人数 + */ + private Long allNum; + /** + * 在分成的人数 + */ + private Long inDivideNum; + /** + * 不分成人数 + */ + private Long notDivideNum; + + private LocalDateTime createTime; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnionUser.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnionUser.java new file mode 100644 index 00000000..2ba2637e --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/CaiUnionUser.java @@ -0,0 +1,62 @@ +package com.ruoyi.cai.domain; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * 123对象 cai_union_user + * + * @author ruoyi + * @date 2023-12-22 + */ +@Data +@TableName("cai_union_user") +public class CaiUnionUser implements Serializable { + + private static final long serialVersionUID=1L; + + /** + * + */ + @TableId(value = "id") + private Long id; + /** + * 工会id + */ + private Long unionId; + /** + * 用户id + */ + private Long userId; + /** + * 视频分成比例 例子"0.7" + */ + private BigDecimal videoDivide; + /** + * 礼物分成比例 例子"0.7" + */ + private BigDecimal giftDivide; + /** + * vip分成 + */ + private BigDecimal vipDivide; + /** + * 0=不分成 1=分成 + */ + private Integer type; + /** + * 收益 + */ + private Long unionEarning; + /** + * 是否为主动邀请,1=主动、0=被动 + */ + private Integer isInitiative; + + private LocalDateTime createTime; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserMemberAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserMemberAdminVo.java new file mode 100644 index 00000000..3f4ab133 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/CaiUserMemberAdminVo.java @@ -0,0 +1,31 @@ +package com.ruoyi.cai.dto.admin.vo; + +import com.ruoyi.cai.domain.CaiUserMember; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +public class CaiUserMemberAdminVo extends CaiUserMember { + /** + * 用户号/ID号 + */ + private String usercode; + /** + * 昵称 + */ + private String nickname; + /** + * 手机号 + */ + private String mobile; + /** + * 头像 + */ + private String avatar; + /** + * 性别 0 未知 1 女 2 男 + */ + private Integer gender; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java new file mode 100644 index 00000000..8fe01bb0 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cai.domain.CaiUnion; + +/** + * 工会列表Mapper接口 + * + * @author 77 + * @date 2023-12-22 + */ +public interface CaiUnionMapper extends BaseMapper { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java new file mode 100644 index 00000000..5230d9fe --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUnionUserMapper.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.cai.domain.CaiUnionUser; + +/** + * 123Mapper接口 + * + * @author ruoyi + * @date 2023-12-22 + */ +public interface CaiUnionUserMapper extends BaseMapper { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java index 7956a0ba..f0e3639e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/CaiUserMemberMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.cai.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.CaiUserMember; +import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; +import org.apache.ibatis.annotations.Param; /** * 会员管理Mapper接口 @@ -11,4 +14,5 @@ import com.ruoyi.cai.domain.CaiUserMember; */ public interface CaiUserMemberMapper extends BaseMapper { + Page pageAdmin(@Param("build") Page build, @Param("bo") CaiUserMemberAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java new file mode 100644 index 00000000..0eb36717 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionService.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.CaiUnion; + +/** + * 工会列表Service接口 + * + * @author 77 + * @date 2023-12-22 + */ +public interface CaiUnionService extends IService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java new file mode 100644 index 00000000..98ba6cd1 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUnionUserService.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.cai.domain.CaiUnionUser; + +/** + * 123Service接口 + * + * @author ruoyi + * @date 2023-12-22 + */ +public interface CaiUnionUserService extends IService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java index c2cf1e75..eb8c9fe0 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/CaiUserMemberService.java @@ -1,7 +1,10 @@ package com.ruoyi.cai.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.CaiUserMember; +import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; +import com.ruoyi.common.core.domain.PageQuery; /** * 会员管理Service接口 @@ -11,4 +14,5 @@ import com.ruoyi.cai.domain.CaiUserMember; */ public interface CaiUserMemberService extends IService { + Page pageAdmin(PageQuery pageQuery, CaiUserMemberAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java new file mode 100644 index 00000000..e70bc306 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.cai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.cai.domain.CaiUnion; +import com.ruoyi.cai.mapper.CaiUnionMapper; +import com.ruoyi.cai.service.CaiUnionService; +import org.springframework.stereotype.Service; + +/** + * 工会列表Service业务层处理 + * + * @author 77 + * @date 2023-12-22 + */ +@Service +public class CaiUnionServiceImpl extends ServiceImpl implements CaiUnionService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java new file mode 100644 index 00000000..6a23727c --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUnionUserServiceImpl.java @@ -0,0 +1,18 @@ +package com.ruoyi.cai.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.cai.domain.CaiUnionUser; +import com.ruoyi.cai.mapper.CaiUnionUserMapper; +import com.ruoyi.cai.service.CaiUnionUserService; +import org.springframework.stereotype.Service; + +/** + * 123Service业务层处理 + * + * @author ruoyi + * @date 2023-12-22 + */ +@Service +public class CaiUnionUserServiceImpl extends ServiceImpl implements CaiUnionUserService { + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java index 7e50bf8f..93cf14f6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/CaiUserMemberServiceImpl.java @@ -1,9 +1,12 @@ package com.ruoyi.cai.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.CaiUserMember; +import com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo; import com.ruoyi.cai.mapper.CaiUserMemberMapper; import com.ruoyi.cai.service.CaiUserMemberService; +import com.ruoyi.common.core.domain.PageQuery; import org.springframework.stereotype.Service; /** @@ -14,4 +17,9 @@ import org.springframework.stereotype.Service; */ @Service public class CaiUserMemberServiceImpl extends ServiceImpl implements CaiUserMemberService { + + @Override + public Page pageAdmin(PageQuery pageQuery, CaiUserMemberAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(),bo); + } } diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml new file mode 100644 index 00000000..3907af3b --- /dev/null +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml new file mode 100644 index 00000000..9dc21778 --- /dev/null +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml index bc5b8bca..0db77874 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml @@ -17,6 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +