init

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<CaiUnion> list(CaiUnion bo, PageQuery pageQuery) {
+        Page<CaiUnion> page = caiUnionService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+
+    /**
+     * 获取工会列表详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("cai:userUnion:query")
+    @GetMapping("/{id}")
+    public R<CaiUnion> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(caiUnionService.removeBatchByIds(Arrays.asList(ids)));
+    }
+}

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<CaiUnionUser> list(CaiUnionUser bo, PageQuery pageQuery) {
+        Page<CaiUnionUser> page = caiUnionUserService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取123详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("cai:unionUser:query")
+    @GetMapping("/{id}")
+    public R<CaiUnionUser> 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<Void> 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<Void> 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<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(caiUnionUserService.removeBatchByIds(Arrays.asList(ids), true));
+    }
+}

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<CaiUserMember> list(CaiUserMember bo, PageQuery pageQuery) {
+    public TableDataInfo<CaiUserMemberAdminVo> list(CaiUserMemberAdminVo bo, PageQuery pageQuery) {
-        Page<CaiUserMember> page = userMemberService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<CaiUserMemberAdminVo> page = userMemberService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 

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;
+
+}

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;
+}

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;
+
+}

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<CaiUnion> {
+
+}

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<CaiUnionUser> {
+
+}

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<CaiUserMember> {
 
+    Page<CaiUserMemberAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") CaiUserMemberAdminVo bo);
 }

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<CaiUnion> {
+
+}

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<CaiUnionUser> {
+
+}

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<CaiUserMember> {
 
+    Page<CaiUserMemberAdminVo> pageAdmin(PageQuery pageQuery, CaiUserMemberAdminVo bo);
 }

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<CaiUnionMapper,CaiUnion> implements CaiUnionService {
+
+}

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<CaiUnionUserMapper,CaiUnionUser> implements CaiUnionUserService {
+
+}

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<CaiUserMemberMapper,CaiUserMember> implements CaiUserMemberService {
+
+    @Override
+    public Page<CaiUserMemberAdminVo> pageAdmin(PageQuery pageQuery, CaiUserMemberAdminVo bo) {
+        return baseMapper.pageAdmin(pageQuery.build(),bo);
+    }
 }

ruoyi-cai/src/main/resources/mapper/cai/CaiUnionMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cai.mapper.CaiUnionMapper">
+
+    <resultMap type="com.ruoyi.cai.domain.CaiUnion" id="CaiUnionResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="name" column="name"/>
+        <result property="status" column="status"/>
+        <result property="unionPayRate" column="union_pay_rate"/>
+        <result property="unionIncomeRate" column="union_income_rate"/>
+        <result property="createTime" column="create_time"/>
+        <result property="allNum" column="all_num"/>
+        <result property="inDivideNum" column="in_divide_num"/>
+        <result property="notDivideNum" column="not_divide_num"/>
+    </resultMap>
+
+
+</mapper>

ruoyi-cai/src/main/resources/mapper/cai/CaiUnionUserMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.cai.mapper.CaiUnionUserMapper">
+
+    <resultMap type="com.ruoyi.cai.domain.CaiUnionUser" id="CaiUnionUserResult">
+        <result property="id" column="id"/>
+        <result property="unionId" column="union_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="videoDivide" column="video_divide"/>
+        <result property="giftDivide" column="gift_divide"/>
+        <result property="vipDivide" column="vip_divide"/>
+        <result property="type" column="type"/>
+        <result property="createTime" column="create_time"/>
+        <result property="unionEarning" column="union_earning"/>
+        <result property="isInitiative" column="is_initiative"/>
+    </resultMap>
+
+
+</mapper>

ruoyi-cai/src/main/resources/mapper/cai/CaiUserMemberMapper.xml

@@ -17,6 +17,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="longs" column="longs"/>
         <result property="expireDate" column="expire_date"/>
     </resultMap>
+    <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.CaiUserMemberAdminVo">
+        select t1.*,t2.age,t2.avatar,t2.usercode,t2.nickname,t2.mobile,t2.gender
+        from cai_user_member t1
+        join cai_user t2 on t1.user_id = t2.id
+        where t1.status = 0
+        order by t1.create_time
+    </select>
 
 
 </mapper>