代理代码生成

ruoyi-agent/src/main/java/com/ruoyi/agent/domain/Agent.java

@@ -25,6 +25,10 @@ public class Agent extends BaseTimeEntity {
      */
     @TableId(value = "agent_id")
     private Long agentId;
+    /**
+     * 用户ID
+     */
+    private Long userId;
     /**
      * 所属省级代理ID
      */

ruoyi-agent/src/main/java/com/ruoyi/agent/domain/AgentApply.java

@@ -32,6 +32,10 @@ public class AgentApply extends BaseTimeEntity {
      */
     @TableId(value = "agent_apply_id")
     private Long agentApplyId;
+    /**
+     * 用户ID
+     */
+    private Long userId;
     /**
      * 代理ID
      */

ruoyi-agent/src/main/java/com/ruoyi/agent/domain/bo/AgentApplyBo.java

@@ -33,6 +33,10 @@ public class AgentApplyBo extends BaseEntity {
      */
     @ApiModelProperty(value = "代理申请ID", required = true)
     private Long agentApplyId;
+    /**
+     * 用户ID
+     */
+    private Long userId;
 
     /**
      * 代理ID
@@ -129,35 +133,30 @@ public class AgentApplyBo extends BaseEntity {
      * 审核时间
      */
     @ApiModelProperty(value = "审核时间", required = true)
-    @NotNull(message = "审核时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date auditTime;
 
     /**
      * 审核类型 1:平台审核 2:省级代理审核
      */
     @ApiModelProperty(value = "审核类型 1:平台审核 2:省级代理审核", required = true)
-    @NotNull(message = "审核类型 1:平台审核 2:省级代理审核不能为空", groups = { AddGroup.class, EditGroup.class })
     private AgentAuditType auditType;
 
     /**
      * 审核人
      */
     @ApiModelProperty(value = "审核人", required = true)
-    @NotNull(message = "审核人不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long auditUserId;
 
     /**
      * 审核结果
      */
     @ApiModelProperty(value = "审核结果", required = true)
-    @NotBlank(message = "审核结果不能为空", groups = { AddGroup.class, EditGroup.class })
     private String auditResult;
 
     /**
      * 手写签名图片地址
      */
     @ApiModelProperty(value = "手写签名图片地址", required = true)
-    @NotBlank(message = "手写签名图片地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String signImage;
 
 

ruoyi-agent/src/main/java/com/ruoyi/agent/domain/bo/AgentBo.java

@@ -31,6 +31,11 @@ public class AgentBo extends BaseEntity {
     @ApiModelProperty(value = "代理ID", required = true)
     private Long agentId;
 
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
     /**
      * 所属省级代理ID
      */

ruoyi-agent/src/main/java/com/ruoyi/agent/domain/vo/AgentApplyVo.java

@@ -35,6 +35,11 @@ public class AgentApplyVo {
     @ApiModelProperty("代理申请ID")
     private Long agentApplyId;
 
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
     /**
      * 代理ID
      */

ruoyi-agent/src/main/java/com/ruoyi/agent/domain/vo/AgentVo.java

@@ -31,6 +31,10 @@ public class AgentVo {
     @ExcelProperty(value = "代理ID")
     @ApiModelProperty("代理ID")
     private Long agentId;
+    /**
+     * 用户ID
+     */
+    private Long userId;
 
     /**
      * 所属省级代理ID

ruoyi-agent/src/main/java/com/ruoyi/agent/exception/AgentExceptionEnum.java

@@ -11,8 +11,7 @@ public enum AgentExceptionEnum implements IIntegerEnum {
 
     // TODO 注意检查错误码，保证系统内唯一
     Agent_IS_NOT_EXISTS(450001, "代理不存在"),
-
-    ;
+    Agent_IS_NOT_PROVINCE_AGENT(450002, "不是省级代理");
 
     private Integer code;
 

ruoyi-agent/src/main/java/com/ruoyi/agent/service/IAgentApplyService.java

@@ -1,10 +1,10 @@
 package com.ruoyi.agent.service;
 
 import com.ruoyi.agent.domain.AgentApply;
-import com.ruoyi.agent.domain.vo.AgentApplyVo;
 import com.ruoyi.agent.domain.bo.AgentApplyBo;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.agent.domain.vo.AgentApplyVo;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.Collection;
 import java.util.List;

ruoyi-agent/src/main/java/com/ruoyi/agent/service/IAgentService.java

@@ -1,10 +1,10 @@
 package com.ruoyi.agent.service;
 
 import com.ruoyi.agent.domain.Agent;
-import com.ruoyi.agent.domain.vo.AgentVo;
 import com.ruoyi.agent.domain.bo.AgentBo;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.agent.domain.vo.AgentVo;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
 
 import java.util.Collection;
 import java.util.List;
@@ -74,4 +74,5 @@ public interface IAgentService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
+    AgentVo provinceAgent(String inviteCode);
 }

ruoyi-agent/src/main/java/com/ruoyi/agent/service/impl/AgentServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.agent.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.agent.enums.AgentLevel;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -162,4 +163,16 @@ public class AgentServiceImpl implements IAgentService {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 
+    @Override
+    public AgentVo provinceAgent(String inviteCode) {
+        AgentVo agentVo = baseMapper.selectVoOne(new LambdaQueryWrapper<Agent>().eq(Agent::getInviteCode, inviteCode).last("limit 1"));
+        if (agentVo == null) {
+            throw new ServiceException(AgentExceptionEnum.Agent_IS_NOT_EXISTS);
+        }
+        if (agentVo.getAgentLevel() != AgentLevel.PROVINCE_AGENT) {
+            throw new ServiceException(AgentExceptionEnum.Agent_IS_NOT_PROVINCE_AGENT);
+        }
+        return agentVo;
+    }
+
 }

ruoyi-agent/src/main/resources/mapper/agent/AgentApplyMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.agent.domain.AgentApply" id="AgentApplyResult">
         <result property="agentApplyId" column="agent_apply_id"/>
+        <result property="userId" column="user_id"/>
         <result property="agentId" column="agent_id"/>
         <result property="parentAgentId" column="parent_agent_id"/>
         <result property="agentLevel" column="agent_level"/>

ruoyi-agent/src/main/resources/mapper/agent/AgentMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="com.ruoyi.agent.domain.Agent" id="AgentResult">
         <result property="agentId" column="agent_id"/>
+        <result property="userId" column="user_id"/>
         <result property="parentAgentId" column="parent_agent_id"/>
         <result property="inviteCode" column="invite_code"/>
         <result property="agentLevel" column="agent_level"/>

ruoyi-api/pom.xml

@@ -21,7 +21,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-base</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-agent</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-business</artifactId>

ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/ApiAgentApplyController.java

@@ -0,0 +1,79 @@
+package com.ruoyi.api.controller.shop;
+
+import com.ruoyi.agent.domain.bo.AgentApplyBo;
+import com.ruoyi.agent.domain.vo.AgentApplyVo;
+import com.ruoyi.agent.service.IAgentApplyService;
+import com.ruoyi.api.controller.common.AbstractApiController;
+import com.ruoyi.common.annotation.RepeatSubmit;
+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.core.validate.QueryGroup;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 代理申请Controller
+ *
+ * @author ruoyi
+ * @date 2025-11-19
+ */
+@Validated
+@Api(value = "代理申请控制器", tags = {"代理申请管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/agent/agentApply")
+public class ApiAgentApplyController extends AbstractApiController {
+
+    private final IAgentApplyService iAgentApplyService;
+
+    /**
+     * 分页查询代理申请列表
+     */
+    @ApiOperation("查询代理申请列表")
+    @GetMapping("/page")
+    public TableDataInfo<AgentApplyVo> page(@Validated(QueryGroup.class) AgentApplyBo bo, PageQuery pageQuery) {
+        return iAgentApplyService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取代理申请详细信息
+     */
+    @ApiOperation("获取代理申请详细信息")
+    @GetMapping("/info/{agentApplyId}")
+    public R<AgentApplyVo> getInfo(@ApiParam("主键")
+                                                  @NotNull(message = "主键不能为空")
+                                                  @PathVariable("agentApplyId") Long agentApplyId) {
+        return R.ok(iAgentApplyService.queryById(agentApplyId));
+    }
+
+    /**
+     * 新增代理申请
+     */
+    @ApiOperation("新增代理申请")
+    @RepeatSubmit()
+    @PostMapping("/add")
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AgentApplyBo bo) {
+        bo.setUserId(getUserId(true));
+        return toAjax(iAgentApplyService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改代理申请
+     */
+    @ApiOperation("修改代理申请")
+    @RepeatSubmit()
+    @PostMapping("/edit")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AgentApplyBo bo) {
+        return toAjax(iAgentApplyService.updateByBo(bo) ? 1 : 0);
+    }
+
+}

ruoyi-api/src/main/java/com/ruoyi/api/controller/shop/ApiAgentController.java

@@ -0,0 +1,46 @@
+package com.ruoyi.api.controller.shop;
+
+import com.ruoyi.agent.domain.vo.AgentVo;
+import com.ruoyi.agent.service.IAgentService;
+import com.ruoyi.api.controller.common.AbstractApiController;
+import com.ruoyi.common.core.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 代理Controller
+ *
+ * @author ruoyi
+ * @date 2025-11-19
+ */
+@Validated
+@Api(value = "代理控制器", tags = {"代理管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/agent/agent")
+public class ApiAgentController extends AbstractApiController {
+
+    private final IAgentService iAgentService;
+
+    /**
+     * 邀请码查省级代理
+     */
+    @ApiOperation("邀请码查省级代理")
+    @GetMapping("/provinceAgent/{inviteCode}")
+    public R<AgentVo> provinceAgent(@ApiParam("邀请码")
+                                                  @NotNull(message = "邀请码不能为空")
+                                                  @PathVariable("inviteCode") String inviteCode) {
+        return R.ok(iAgentService.provinceAgent(inviteCode));
+    }
+
+
+}

ruoyi-line/src/main/resources/subsidy/SubsidyModeMapper.xml

@@ -22,6 +22,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <select id="getMaxSortOrder" resultType="java.math.BigDecimal">
-        SELECT IFNULL(max(sort_order),0) FROM t_subsidy_mode WHERE business_id = #{businessId}
+        SELECT IFNULL(max(sort_order),0) FROM tb_subsidy_mode WHERE business_id = #{businessId}
     </select>
 </mapper>