代理伙伴

pom.xml

@@ -397,11 +397,6 @@
                 <artifactId>ruoyi-tool</artifactId>
                 <version>${ruoyi-vue-plus.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-agent</artifactId>
-                <version>${ruoyi-vue-plus.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.ruoyi</groupId>
                 <artifactId>ruoyi-business</artifactId>
@@ -593,7 +588,6 @@
         <module>ruoyi-line</module>
         <module>ruoyi-business</module>
         <module>ruoyi-tool</module>
-        <module>ruoyi-agent</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -86,10 +86,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-business</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-agent</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-shop</artifactId>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/agent/AgentApplyController.java

@@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.agent.domain.bo.AgentApplyBo;
 import com.ruoyi.agent.domain.vo.AgentApplyVo;
 import com.ruoyi.agent.enums.AgentAuditType;
-import com.ruoyi.agent.enums.AgentLevel;
 import com.ruoyi.agent.service.IAgentApplyService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/subsidy/SubsidyQueueController.java

@@ -49,7 +49,7 @@ public class SubsidyQueueController extends BaseController {
     @ApiOperation("获取当前商家的排队数量")
     @GetMapping("/validQueueCount}")
     public R<Long> validQueueCount() {
-        return R.ok(iSubsidyQueueService.validQueueCount(getBusinessId(true)));
+        return R.ok(iSubsidyQueueService.validQueueCount(getBusinessId(true), false));
     }
 
 

ruoyi-agent/pom.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.ruoyi</groupId>
-        <artifactId>ruoyi-vue-plus</artifactId>
-        <version>4.0.1</version>
-    </parent>
-
-    <artifactId>ruoyi-agent</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-business</artifactId>
-        </dependency>
-    </dependencies>
-</project>

ruoyi-api/pom.xml

@@ -21,10 +21,6 @@
             <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-agent/src/main/java/com/ruoyi/agent/domain/AgentApply.java

@@ -6,14 +6,8 @@ import com.ruoyi.agent.enums.AgentLevel;
 import com.ruoyi.common.core.domain.BaseTimeEntity;
 import com.ruoyi.common.enums.AuditStatus;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 代理申请对象 tb_agent_apply

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

@@ -10,8 +10,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
-import java.util.Date;
-
 import java.math.BigDecimal;
 import com.ruoyi.common.core.domain.BaseEntity;
 

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

@@ -11,8 +11,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
 
-import java.util.Date;
-
 import java.math.BigDecimal;
 import com.ruoyi.common.core.domain.BaseEntity;
 

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

@@ -1,18 +1,15 @@
 package com.ruoyi.agent.domain.vo;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.agent.enums.AgentAuditType;
 import com.ruoyi.agent.enums.AgentLevel;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.enums.AuditStatus;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
 
 /**

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

@@ -10,7 +10,6 @@ import com.ruoyi.common.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
 
 /**

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

@@ -11,7 +11,6 @@ import com.ruoyi.agent.domain.AgentApply;
 import com.ruoyi.agent.domain.bo.AgentApplyBo;
 import com.ruoyi.agent.domain.bo.AgentBo;
 import com.ruoyi.agent.domain.vo.AgentApplyVo;
-import com.ruoyi.agent.domain.vo.AgentVo;
 import com.ruoyi.agent.enums.AgentAuditType;
 import com.ruoyi.agent.enums.AgentLevel;
 import com.ruoyi.agent.exception.AgentApplyExceptionEnum;
@@ -24,9 +23,6 @@ import com.ruoyi.common.enums.AuditStatus;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.user.domain.User;
-import com.ruoyi.user.domain.bo.UserBo;
-import com.ruoyi.user.service.IUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -37,7 +33,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 代理申请Service业务层处理

ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BusinessBalanceRecordBo.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @Data
 @EqualsAndHashCode
 @ApiModel("商家的余额记录业务对象")
-public class BusinessBalanceRecordBo implements Serializable {
+public class BusinessBalanceRecordBo extends BaseEntity {
 
     /**
      * 余额明细ID

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessApplyServiceImpl.java

@@ -151,6 +151,7 @@ public class BusinessApplyServiceImpl implements IBusinessApplyService {
      */
     @Override
     public Boolean insertByBo(BusinessApplyBo bo) {
+
         BusinessApply businessApply = baseMapper.selectOne(new LambdaQueryWrapper<BusinessApply>().eq(BusinessApply::getUserId, bo.getUserId()).last("limit 1"));
         BusinessApply saveOrUpdate;
         if(ObjectUtil.isNotNull(businessApply)){

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessBalanceRecordServiceImpl.java

@@ -17,7 +17,7 @@ import com.ruoyi.business.domain.vo.BusinessBalanceRecordVo;
 import com.ruoyi.business.domain.BusinessBalanceRecord;
 import com.ruoyi.business.mapper.BusinessBalanceRecordMapper;
 import com.ruoyi.business.service.IBusinessBalanceRecordService;
-import com.ruoyi.business.exception.IBusinessBalanceRecordExceptionEnum;
+import com.ruoyi.business.exception.BusinessBalanceRecordExceptionEnum;
 
 import java.util.List;
 import java.util.Map;