训练营二期7.22上线

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsCampRole.java

@@ -0,0 +1,112 @@
+package com.kxs.system.api.model;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 训练营角色表(KxsCampRole)表实体类
+ *
+ * @author 系统
+ * @since 2024-07-17 13:58:04
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class KxsCampRole extends Model<KxsCampRole> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    
+    
+    /**
+     * 主键ID
+     */
+    @Schema(description = "主键ID")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+
+    /**
+     * 新增时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "新增时间")
+    private LocalDateTime createTime;
+
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+
+    /**
+     * 删除标记，0未删除，1已删除
+     */
+    @Schema(description = "删除标记，0未删除，1已删除")
+    private String delFlag;
+
+
+    /**
+     * 版本
+     */
+    @Schema(description = "版本")
+    private Integer version;
+
+
+    /**
+     * 角色名称
+     */
+    @Schema(description = "角色名称")
+    @NotBlank(message = "角色名称不能为空")
+    private String roleName;
+
+
+    /**
+     * 创建人
+     */
+    @Schema(description = "创建人")
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+
+    /**
+     * 修改人
+     */
+    @Schema(description = "修改人")
+    @TableField(fill = FieldFill.UPDATE)
+    private String updateBy;
+
+
+    /**
+     * 状态
+     */
+    @Schema(description = "状态")
+    private Integer status;
+
+
+    /**
+     * 备注
+     */
+    @Schema(description = "备注")
+    private String remark;
+
+
+
+
+}
+

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/model/KxsCampUser.java

@@ -158,6 +158,12 @@ public class KxsCampUser extends Model<KxsCampUser> implements Serializable {
     @ExcelProperty(value = "分组ID")
     private Integer groupId;
 
+    /**
+     * 角色ID
+     */
+    @Schema(description = "角色 D")
+    private Integer roleId;
+
 
 }
 

kxs-system/kxs-system-api/src/main/java/com/kxs/system/api/vo/admin/camp/SysCampUserPageVO.java

@@ -23,5 +23,10 @@ public class SysCampUserPageVO extends KxsCampUser {
 	@ExcelProperty("分组名称")
 	private String groupName;
 
+	/**
+	 * 角色名称
+	 */
+	@ExcelProperty("角色名称")
+	private String roleName;
 
 }

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysCampController.java

@@ -78,7 +78,7 @@ public class SysCampController {
      * @param param 查询实体
      * @return 训练营-列表
      */
-    @ResponseExcel(name = "分组参与创客列表", include = { "groupName","groupId", "username","userCode","createTime","teamOpenNum","teamOrderNum","teamLeaderNum"})
+    @ResponseExcel(name = "分组参与创客列表", include = { "groupName","groupId", "roleName", "username","userCode","createTime","teamOpenNum","teamOrderNum","teamLeaderNum"})
     @GetMapping("/exportGroupUser")
 //    @PreAuthorize("@pms.hasPermission('sys_camp_user_export')")
     public List<SysCampUserPageVO> exportGroupUser(@ParameterObject KxsCampUser param) {
@@ -232,6 +232,19 @@ public class SysCampController {
         return R.ok(kxsCampGroupService.removeByData(groupId));
     }
 
+    /**
+     * 训练营-分组-设置角色
+     *
+     * @param param 请求参数
+     * @return 训练营-分组-设置角色
+     */
+    @PutMapping("/userSetRole")
+    //    @PreAuthorize("@pms.hasPermission('sys_camp_group_set_role')")
+    public R userSetRole(@RequestBody KxsCampUser param) {
+
+        return R.ok(kxsCampUserService.userSetRole(param));
+    }
+
 
     /**
      * 训练营-添加创客

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/controller/admin/SysCampRoleController.java

@@ -0,0 +1,76 @@
+package com.kxs.system.biz.controller.admin;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kxs.common.core.util.R;
+import com.kxs.system.api.model.KxsCampRole;
+import com.kxs.system.biz.service.KxsCampRoleService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 系统模块(SysCampRole)控制层
+ *
+ * @author 系统
+ * @since 2024-07-17 14:03:13
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("sysCampRole")
+public class SysCampRoleController {
+
+    /**
+     * 服务对象
+     */
+    private final KxsCampRoleService kxsCampRoleService;
+
+
+
+    /**
+     * 训练营-角色-列表
+     *
+     * @param page 分页对象
+     * @param param 查询实体
+     * @return 训练营-角色-列表
+     */
+    @GetMapping("/page")
+    public R page(Page<KxsCampRole> page, @ParameterObject KxsCampRole param) {
+
+        return R.ok(kxsCampRoleService.page(page, new QueryWrapper<>(param)));
+    }
+
+
+    /**
+     * 训练营-角色-新增
+     *
+     * @param param 实体对象
+     * @return 训练营-角色-新增
+     */
+    @PostMapping("/save")
+    public R save(@RequestBody @Valid KxsCampRole param) {
+
+        return R.ok(kxsCampRoleService.saveOrUpdate(param));
+    }
+
+
+    /**
+     * 训练营-角色-删除
+     *
+     * @return 训练营-角色-删除
+     */
+    @DeleteMapping("removeById/{id}")
+    public R removeById(@PathVariable Integer id) {
+
+        return R.ok(kxsCampRoleService.removeById(id));
+    }
+
+
+
+
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/mapper/KxsCampRoleMapper.java

@@ -0,0 +1,17 @@
+package com.kxs.system.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kxs.system.api.model.KxsCampRole;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 训练营角色表(KxsCampRole)表数据库访问层
+ *
+ * @author 系统
+ * @since 2024-07-17 13:58:04
+ */
+@Mapper
+public interface KxsCampRoleMapper extends BaseMapper<KxsCampRole> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsCampGroupService.java

@@ -2,6 +2,7 @@ package com.kxs.system.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.system.api.model.KxsCampGroup;
+import com.kxs.system.api.model.KxsCampUser;
 
 /**
  * 训练营分组(KxsCampGroup)表服务接口
@@ -26,5 +27,6 @@ public interface KxsCampGroupService extends IService<KxsCampGroup> {
      * @return {@link Boolean}
      */
     Boolean removeByData(Integer groupId);
+
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsCampRoleService.java

@@ -0,0 +1,15 @@
+package com.kxs.system.biz.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.kxs.system.api.model.KxsCampRole;
+
+/**
+ * 训练营角色表(KxsCampRole)表服务接口
+ *
+ * @author 系统
+ * @since 2024-07-17 13:58:04
+ */
+public interface KxsCampRoleService extends IService<KxsCampRole> {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/KxsCampUserService.java

@@ -51,5 +51,13 @@ public interface KxsCampUserService extends IService<KxsCampUser> {
      */
     List<SysCampUserPageVO> exportGroupUser(KxsCampUser param);
 
+
+    /**
+     * 用户设置角色
+     *
+     * @param param 参数
+     * @return {@link Boolean}
+     */
+    Boolean userSetRole(KxsCampUser param);
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampGroupServiceImpl.java

@@ -57,5 +57,6 @@ public class KxsCampGroupServiceImpl extends ServiceImpl<KxsCampGroupMapper, Kxs
         }
         return removeById(groupId);
     }
+
 }
 

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampReportServiceImpl.java

@@ -139,7 +139,7 @@ public class KxsCampReportServiceImpl extends ServiceImpl<KxsCampReportMapper, K
             kxsCampBonusLog.setSourceId(kxsCampUser.getUserId());
             kxsCampBonusLog.setUsername(kxsCampUser.getUsername());
             kxsCampBonusLog.setUserCode(kxsCampUser.getUserCode());
-            kxsCampBonusLog.setRemark("系统添加");
+            kxsCampBonusLog.setRemark("系统添加" + param.getRemark());
             kxsCampBonusLog.setKind(KindTypeEnum.ADD.getType());
             kxsCampBonusLog.setSourceNum(param.getSourceNum());
             kxsCampBonusLog.setSourceType(param.getSourceType());

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampRoleServiceImpl.java

@@ -0,0 +1,19 @@
+package com.kxs.system.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.system.biz.mapper.KxsCampRoleMapper;
+import com.kxs.system.api.model.KxsCampRole;
+import com.kxs.system.biz.service.KxsCampRoleService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 训练营角色表(KxsCampRole)表服务实现类
+ *
+ * @author 系统
+ * @since 2024-07-17 13:58:04
+ */
+@Service("kxsCampRoleService")
+public class KxsCampRoleServiceImpl extends ServiceImpl<KxsCampRoleMapper, KxsCampRole> implements KxsCampRoleService {
+
+}
+

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampServiceImpl.java

@@ -255,7 +255,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
             kxsCampBonusLog.setSourceId(user.getId());
             kxsCampBonusLog.setUsername(user.getUsername());
             kxsCampBonusLog.setUserCode(user.getUserCode());
-            kxsCampBonusLog.setRemark("商城下单");
+            kxsCampBonusLog.setRemark("商城下单-" + param.getOrderNo());
             kxsCampBonusLog.setSourceNum(1);
             kxsCampBonusLog.setKind(KindTypeEnum.ADD.getType());
             //27|39 大盟主下单和续费
@@ -289,7 +289,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
             kxsCampBonusLog.setSourceId(user.getId());
             kxsCampBonusLog.setUsername(user.getUsername());
             kxsCampBonusLog.setUserCode(user.getUserCode());
-            kxsCampBonusLog.setRemark("商城下单");
+            kxsCampBonusLog.setRemark("商城下单-" + param.getOrderNo());
             kxsCampBonusLog.setSourceNum(param.getBuyCount());
             kxsCampBonusLog.setKind(KindTypeEnum.ADD.getType());
             if (param.getProductId() == 10) {
@@ -312,7 +312,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
                 long subCount = 5 - bonusLog.getSourceNum();
                 kxsCampBonusLog.setSourceNum(param.getBuyCount() > subCount ? (int) subCount : param.getBuyCount());
                 kxsCampBonusLog.setSourceType(CampSourceTypeEnum.S_MZQ.getType());
-                kxsCampBonusLog.setRemark("盟主兑换");
+                kxsCampBonusLog.setRemark("盟主兑换-" + param.getOrderNo());
             }
             campBonusLogService.save(kxsCampBonusLog);
             log.info("用户/上级{}参加训练营{}，订单ID{}, 奖金池{}，订单数{}", param.getUserId(), kxsCamp.getId(), param.getId(), kxsCamp.getBonusPool(), kxsCamp.getOrderNum());
@@ -374,7 +374,7 @@ public class KxsCampServiceImpl extends ServiceImpl<KxsCampMapper, KxsCamp> impl
         kxsCampBonusLog.setSourceId(user.getId());
         kxsCampBonusLog.setUsername(user.getUsername());
         kxsCampBonusLog.setUserCode(user.getUserCode());
-        kxsCampBonusLog.setRemark("开通商户");
+        kxsCampBonusLog.setRemark("开通商户-" + param.getSn());
         kxsCampBonusLog.setSourceNum(sourceNum);
         kxsCampBonusLog.setKind(KindTypeEnum.ADD.getType());
         switch (param.getActType()) {

kxs-system/kxs-system-biz/src/main/java/com/kxs/system/biz/service/impl/KxsCampUserServiceImpl.java

@@ -3,11 +3,14 @@ package com.kxs.system.biz.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.exception.GlobalCustomerException;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.system.api.model.KxsCamp;
+import com.kxs.system.api.model.KxsCampRole;
 import com.kxs.system.api.vo.admin.camp.SysCampUserPageVO;
 import com.kxs.system.api.vo.kxsapp.camp.CampUserPageVO;
 import com.kxs.system.biz.mapper.KxsCampMapper;
+import com.kxs.system.biz.mapper.KxsCampRoleMapper;
 import com.kxs.system.biz.mapper.KxsCampUserMapper;
 import com.kxs.system.api.model.KxsCampUser;
 import com.kxs.system.biz.service.KxsCampUserService;
@@ -15,6 +18,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * 训练营参与创客(KxsCampUser)表服务实现类
@@ -27,6 +31,8 @@ import java.util.List;
 public class KxsCampUserServiceImpl extends ServiceImpl<KxsCampUserMapper, KxsCampUser> implements KxsCampUserService {
 
     private final KxsCampMapper kxsCampMapper;
+
+    private final KxsCampRoleMapper kxsCampRoleMapper;
     @Override
     public IPage<CampUserPageVO> getByPage(Page<CampUserPageVO> page, Integer campId) {
 
@@ -51,5 +57,17 @@ public class KxsCampUserServiceImpl extends ServiceImpl<KxsCampUserMapper, KxsCa
 
         return baseMapper.getSysByPage(param);
     }
+
+    @Override
+    public Boolean userSetRole(KxsCampUser param) {
+
+        KxsCampRole campRole = kxsCampRoleMapper.selectById(param.getRoleId());
+        Optional.ofNullable(campRole).orElseThrow(() -> new GlobalCustomerException("角色不存在"));
+
+        KxsCampUser campUser = getById(param.getId());
+        Optional.ofNullable(campUser).orElseThrow(() -> new GlobalCustomerException("用户不存在"));
+
+        return updateById(param);
+    }
 }
 

kxs-system/kxs-system-biz/src/main/resources/mapper/KxsCampUserMapper.xml

@@ -21,6 +21,7 @@
         <result column="team_gd_num" property="teamGdNum" />
         <result column="team_lkb_num" property="teamLkbNum" />
         <result column="group_id" property="groupId" />
+        <result column="role_id" property="roleId" />
 
     </resultMap>
     <select id="getByPage" resultType="com.kxs.system.api.vo.kxsapp.camp.CampUserPageVO">
@@ -31,8 +32,9 @@
             </where>
     </select>
     <select id="getSysByPage" resultType="com.kxs.system.api.vo.admin.camp.SysCampUserPageVO">
-        select a.*, cg.group_name from kxs_camp_user a
+        select a.*, cg.group_name, cr.role_name from kxs_camp_user a
         left join kxs_camp_group cg on cg.group_id = a.group_id
+        left join kxs_camp_role cr on cr.id = a.role_id
         <where>
             a.del_flag = 0
             and a.camp_id = #{param.campId}
@@ -45,6 +47,9 @@
             <if test="param.groupId != null and param.groupId != ''">
                 and a.group_id = #{param.groupId}
             </if>
+            <if test="param.roleId != null and param.roleId != ''">
+                and a.role_id = #{param.roleId}
+            </if>
         </where>
     </select>