分账配置

ruoyi-admin/src/main/java/com/ruoyi/web/controller/base/JzqOcrController.java

@@ -8,15 +8,15 @@ import com.ruoyi.tool.response.OcrIdentityResponse;
 import com.ruoyi.tool.service.JzqService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api("君子签")
+@Api(value = "君子签控制器", tags = {"君子签"})
 @RestController
 @RequestMapping("/jzq/ocr")
-@AllArgsConstructor
+@RequiredArgsConstructor
 public class JzqOcrController {
 
     private final JzqService jzqService;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/PlatformInfoController.java

@@ -1,15 +1,17 @@
-package com.ruoyi.web.controller.info;
+package com.ruoyi.web.controller.base;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.base.platform.domain.bo.PlatformInfoBo;
+import com.ruoyi.base.platform.domain.vo.PlatformInfoVo;
+import com.ruoyi.base.platform.service.IPlatformInfoService;
 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.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.info.base.domain.bo.PlatformInfoBo;
-import com.ruoyi.info.base.domain.vo.PlatformInfoVo;
-import com.ruoyi.info.base.service.IPlatformInfoService;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -34,6 +36,7 @@ public class PlatformInfoController extends BaseController {
     /**
      * 获取平台信息管理详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取平台信息管理详细信息")
     @SaCheckPermission("base:platformInfo:query")
     @GetMapping("/info")
@@ -44,6 +47,7 @@ public class PlatformInfoController extends BaseController {
     /**
      * 新增平台信息管理
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增平台信息管理")
     @SaCheckPermission("base:platformInfo:add")
     @Log(title = "平台信息管理", businessType = BusinessType.INSERT)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/RevenueSharingConfigController.java

@@ -1,15 +1,15 @@
-package com.ruoyi.web.controller.info;
+package com.ruoyi.web.controller.base;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.base.revenue.domain.bo.RevenueSharingConfigBo;
+import com.ruoyi.base.revenue.domain.vo.RevenueSharingConfigVo;
+import com.ruoyi.base.revenue.service.IRevenueSharingConfigService;
 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.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.info.base.domain.bo.RevenueSharingConfigBo;
-import com.ruoyi.info.base.domain.vo.RevenueSharingConfigVo;
-import com.ruoyi.info.base.service.IRevenueSharingConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

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

@@ -5,6 +5,8 @@ import com.ruoyi.agent.domain.bo.AgentBo;
 import com.ruoyi.agent.domain.vo.AgentAmountStatisticsVo;
 import com.ruoyi.agent.domain.vo.AgentVo;
 import com.ruoyi.agent.service.IAgentService;
+import com.ruoyi.business.domain.bo.BusinessBo;
+import com.ruoyi.business.domain.vo.BusinessVo;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
@@ -81,4 +83,14 @@ public class AgentController extends BaseController {
         ExcelUtil.exportExcel(list, "代理", AgentVo.class, response);
     }
 
+    /**
+     * 分页获取代理商家
+     */
+    @ApiOperation("分页获取代理商家")
+    @SaCheckPermission("agent:agent:list")
+    @GetMapping("/business/page")
+    public TableDataInfo<BusinessVo> businessPage(@Validated(QueryGroup.class) BusinessBo bo, PageQuery pageQuery) {
+        return iAgentService.businessPage(bo, pageQuery);
+    }
+
 }

ruoyi-admin/src/main/resources/application-dev.yml

@@ -256,3 +256,4 @@ jzq:
   ocrBusinessLic: /v2/ocr/ocrBusinessLic
   uploadPersSign: /v2/user/uploadPersSign
   applySign: /v2/sign/applySign
+  organizationCreate: /v2/user/organizationCreate

ruoyi-agent/pom.xml

@@ -12,17 +12,9 @@
     <artifactId>ruoyi-agent</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-user</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-business</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-info</artifactId>
-        </dependency>
     </dependencies>
 </project>

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

@@ -43,7 +43,6 @@ public class AgentAccountCodeApplyBo extends BaseEntity {
      * 省级代理ID
      */
     @ApiModelProperty(value = "省级代理ID", required = true)
-    @NotNull(message = "省级代理ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long parentAgentId;
 
     /**

ruoyi-agent/src/main/java/com/ruoyi/agent/mapper/AgentBalanceRecordMapper.java

@@ -1,9 +1,8 @@
 package com.ruoyi.agent.mapper;
 
 import com.ruoyi.agent.domain.AgentBalanceRecord;
+import com.ruoyi.agent.domain.bo.AgentBalanceRecordBo;
 import com.ruoyi.agent.domain.vo.AgentBalanceRecordVo;
-import com.ruoyi.agent.enums.BalanceSourceType;
-import com.ruoyi.agent.enums.BillType;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,5 +16,5 @@ import java.math.BigDecimal;
  */
 public interface AgentBalanceRecordMapper extends BaseMapperPlus<AgentBalanceRecordMapper, AgentBalanceRecord, AgentBalanceRecordVo> {
 
-    BigDecimal sumStatistics(@Param("agentId") Long agentId, @Param("billType") BillType billType, @Param("balanceSourceType") BalanceSourceType balanceSourceType);
+    BigDecimal sumStatistics(@Param("bo") AgentBalanceRecordBo bo);
 }

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

@@ -77,5 +77,5 @@ public interface IAgentBalanceRecordService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
-    BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType balanceSourceType);
+    BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType sourceType, Long sourceId);
 }

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

@@ -5,6 +5,8 @@ import com.ruoyi.agent.domain.bo.AgentBo;
 import com.ruoyi.agent.domain.bo.AgentChangeBalanceBo;
 import com.ruoyi.agent.domain.vo.AgentAmountStatisticsVo;
 import com.ruoyi.agent.domain.vo.AgentVo;
+import com.ruoyi.business.domain.bo.BusinessBo;
+import com.ruoyi.business.domain.vo.BusinessVo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -102,4 +104,10 @@ public interface IAgentService {
      * 修改代理的余额
      */
     void changeAgentBalance(AgentChangeBalanceBo bo);
+
+    TableDataInfo<BusinessVo> businessPage(BusinessBo bo, PageQuery pageQuery);
+
+    Long queryIdByUserId(Long userId);
+
+    AgentVo queryByUserId(Long userId);
 }

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

@@ -158,8 +158,13 @@ public class AgentBalanceRecordServiceImpl implements IAgentBalanceRecordService
     }
 
     @Override
-    public BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType balanceSourceType) {
-        return baseMapper.sumStatistics(agentId, billType, balanceSourceType);
+    public BigDecimal sumStatistics(Long agentId, BillType billType, BalanceSourceType sourceType, Long sourceId) {
+        AgentBalanceRecordBo bo = new AgentBalanceRecordBo();
+        bo.setAgentId(agentId);
+        bo.setBillType(billType);
+        bo.setSourceType(sourceType);
+        bo.setSourceId(sourceId);
+        return baseMapper.sumStatistics(bo);
     }
 
 }

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

@@ -21,6 +21,8 @@ import com.ruoyi.agent.mapper.AgentMapper;
 import com.ruoyi.agent.service.IAgentAccountCodeService;
 import com.ruoyi.agent.service.IAgentBalanceRecordService;
 import com.ruoyi.agent.service.IAgentService;
+import com.ruoyi.business.domain.bo.BusinessBo;
+import com.ruoyi.business.domain.vo.BusinessVo;
 import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -30,8 +32,8 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.ShareCodeUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.info.base.domain.vo.PlatformInfoVo;
-import com.ruoyi.info.base.service.IPlatformInfoService;
+import com.ruoyi.base.platform.domain.vo.PlatformInfoVo;
+import com.ruoyi.base.platform.service.IPlatformInfoService;
 import com.ruoyi.tool.service.JzqService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
@@ -91,8 +93,8 @@ public class AgentServiceImpl implements IAgentService {
 
     private List<AgentVo> convertList(List<AgentVo> voList) {
         return voList.stream().map(vo -> {
-            vo.setTotalStatisticsAmount(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.INNER, BalanceSourceType.USER_ORDER));
-            vo.setTotalStatisticsWithdrawalAmount(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.OUTER, BalanceSourceType.WITHDRAW));
+            vo.setTotalStatisticsAmount(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.INNER, BalanceSourceType.USER_ORDER, null));
+            vo.setTotalStatisticsWithdrawalAmount(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.OUTER, BalanceSourceType.WITHDRAW, null));
             vo.setSurplusAccountCode(agentAccountCodeService.sumSurplusAccountCode(vo.getAgentId()));
             vo.setPromotionBusinessNum(businessService.sumPromotionBusinessNum(vo.getAgentId()));
             return vo;
@@ -357,4 +359,32 @@ public class AgentServiceImpl implements IAgentService {
         agentBalanceRecordService.insertByBo(recordBo);
     }
 
+    @Override
+    public TableDataInfo<BusinessVo> businessPage(BusinessBo bo, PageQuery pageQuery) {
+        if (ObjectUtil.isNull(bo.getAgentId())) {
+            return null;
+        }
+        TableDataInfo<BusinessVo> tableDataInfo = businessService.queryPageList(bo, pageQuery);
+        tableDataInfo.setRows(convertBusinessList(tableDataInfo.getRows()));
+        return tableDataInfo;
+    }
+
+    @Override
+    public Long queryIdByUserId(Long userId) {
+        Agent agent = baseMapper.selectOne(new LambdaQueryWrapper<Agent>().select(Agent::getAgentId).eq(Agent::getUserId, userId));
+        return agent == null ? null : agent.getAgentId();
+    }
+
+    @Override
+    public AgentVo queryByUserId(Long userId) {
+        return null;
+    }
+
+    private List<BusinessVo> convertBusinessList(List<BusinessVo> voList) {
+        return voList.stream().map(vo -> {
+            vo.setAgentIncome(agentBalanceRecordService.sumStatistics(vo.getAgentId(), BillType.INNER, BalanceSourceType.USER_ORDER, vo.getBusinessId()));
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
 }

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

@@ -20,9 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="sumStatistics" resultType="java.math.BigDecimal">
         SELECT SUM(entry_value) FROM tb_agent_balance_record
-        WHERE agent_id = #{agentId}
-        AND bill_type = #{billType}
-        AND source_type = #{balanceSourceType}
+        WHERE agent_id = #{bo.agentId}
+        AND bill_type = #{bo.billType}
+        AND source_type = #{bo.sourceType}
+        <if test="bo.sourceId != null">
+          AND source_id = #{bo.sourceId}
+        </if>
+
     </select>
 
 

ruoyi-api/src/main/java/com/ruoyi/api/controller/common/AbstractApiController.java

@@ -9,6 +9,7 @@
 package com.ruoyi.api.controller.common;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.agent.service.IAgentService;
 import com.ruoyi.business.service.IBusinessService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.exception.ServiceException;
@@ -29,6 +30,8 @@ public abstract class AbstractApiController {
     RedisTemplate<String, String> redisTemplate;
     @Autowired
     protected IBusinessService businessService;
+    @Autowired
+    protected IAgentService agentService;
 
 
     /**
@@ -84,4 +87,16 @@ public abstract class AbstractApiController {
         }
         return null;
     }
+
+    protected Long getAgentByUserId(Long userId, boolean isThrow) {
+        Long id = agentService.queryIdByUserId(userId);
+        if (ObjectUtil.isNotNull(id)) {
+            return id;
+        } else {
+            if (isThrow) {
+                throw new ServiceException(ApiUserException.AGENT_NOT_EXISTS);
+            }
+        }
+        return null;
+    }
 }

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

@@ -0,0 +1,69 @@
+package com.ruoyi.api.controller.shop;
+
+import com.ruoyi.agent.domain.bo.AgentAccountCodeApplyBo;
+import com.ruoyi.agent.domain.vo.AgentAccountCodeApplyVo;
+import com.ruoyi.agent.service.IAgentAccountCodeApplyService;
+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.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/agentAccountCodeApply")
+public class ApiAgentAccountCodeApplyController extends AbstractApiController {
+
+    private final IAgentAccountCodeApplyService iAgentAccountCodeApplyService;
+
+    /**
+     * 分页查询代理账户码申请列表
+     */
+    @ApiOperation("查询代理账户码申请列表")
+    @GetMapping("/page")
+    public TableDataInfo<AgentAccountCodeApplyVo> page(@Validated(QueryGroup.class) AgentAccountCodeApplyBo bo, PageQuery pageQuery) {
+        bo.setAgentId(getAgentByUserId(getUserId(true), true));
+        return iAgentAccountCodeApplyService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取代理账户码申请详细信息
+     */
+    @ApiOperation("获取代理账户码申请详细信息")
+    @GetMapping("/info/{id}")
+    public R<AgentAccountCodeApplyVo> getInfo(@ApiParam("主键")
+                                                  @NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return R.ok(iAgentAccountCodeApplyService.queryById(id));
+    }
+
+    /**
+     * 新增代理账户码申请
+     */
+    @ApiOperation("新增代理账户码申请")
+    @RepeatSubmit()
+    @PostMapping("/add")
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AgentAccountCodeApplyBo bo) {
+        bo.setAgentId(getAgentByUserId(getUserId(true), true));
+        return toAjax(iAgentAccountCodeApplyService.insertByBo(bo) ? 1 : 0);
+    }
+
+}

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

@@ -42,5 +42,14 @@ public class ApiAgentController extends AbstractApiController {
         return R.ok(iAgentService.provinceAgent(inviteCode));
     }
 
+    /**
+     * 获取代理详细信息
+     */
+    @ApiOperation("获取代理详细信息")
+    @GetMapping("/info")
+    public R<AgentVo> getInfo() {
+        return R.ok(iAgentService.queryByUserId(getUserId(true)));
+    }
+
 
 }

ruoyi-base/pom.xml

@@ -25,6 +25,10 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-shop-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-tool</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

ruoyi-info/src/main/java/com/ruoyi/info/base/domain/PlatformInfo.java

@@ -1,15 +1,11 @@
-package com.ruoyi.info.base.domain;
+package com.ruoyi.base.platform.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 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_platform_info
@@ -24,7 +20,7 @@ public class PlatformInfo extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Integer id;

ruoyi-info/src/main/java/com/ruoyi/info/base/domain/bo/PlatformInfoBo.java

@@ -1,5 +1,7 @@
-package com.ruoyi.info.base.domain.bo;
+package com.ruoyi.base.platform.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
@@ -7,13 +9,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 平台信息管理业务对象 tb_platform_info
@@ -65,6 +65,8 @@ public class PlatformInfoBo extends BaseEntity {
      */
     @ApiModelProperty(value = "成立日期", required = true)
     @NotNull(message = "成立日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date establishmentDate;
 
     /**
@@ -79,6 +81,8 @@ public class PlatformInfoBo extends BaseEntity {
      */
     @ApiModelProperty(value = "营业期限开始日期", required = true)
     @NotNull(message = "营业期限开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date businessTermStart;
 
     /**
@@ -86,6 +90,8 @@ public class PlatformInfoBo extends BaseEntity {
      */
     @ApiModelProperty(value = "营业期限结束日期", required = true)
     @NotNull(message = "营业期限结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date businessTermEnd;
 
     /**
@@ -137,6 +143,8 @@ public class PlatformInfoBo extends BaseEntity {
      */
     @ApiModelProperty(value = "身份证有效期开始日期", required = true)
     @NotNull(message = "身份证有效期开始日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date idCardValidStart;
 
     /**
@@ -144,6 +152,8 @@ public class PlatformInfoBo extends BaseEntity {
      */
     @ApiModelProperty(value = "身份证有效期结束日期", required = true)
     @NotNull(message = "身份证有效期结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date idCardValidEnd;
 
     /**

ruoyi-info/src/main/java/com/ruoyi/info/base/domain/vo/PlatformInfoVo.java

@@ -1,15 +1,12 @@
-package com.ruoyi.info.base.domain.vo;
+package com.ruoyi.base.platform.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.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 

ruoyi-info/src/main/java/com/ruoyi/info/base/exception/PlatformInfoExceptionEnum.java

@@ -1,6 +1,7 @@
-package com.ruoyi.info.base.exception;
+package com.ruoyi.base.platform.exception;
 
 import com.ruoyi.common.enums.IIntegerEnum;
+
 import java.util.Objects;
 
 

ruoyi-info/src/main/java/com/ruoyi/info/base/mapper/PlatformInfoMapper.java

@@ -1,8 +1,8 @@
-package com.ruoyi.info.base.mapper;
+package com.ruoyi.base.platform.mapper;
 
-import com.ruoyi.info.base.domain.PlatformInfo;
-import com.ruoyi.info.base.domain.vo.PlatformInfoVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.base.platform.domain.PlatformInfo;
+import com.ruoyi.base.platform.domain.vo.PlatformInfoVo;
 
 /**
  * 平台信息管理Mapper接口

ruoyi-info/src/main/java/com/ruoyi/info/base/service/IPlatformInfoService.java

@@ -1,10 +1,10 @@
-package com.ruoyi.info.base.service;
+package com.ruoyi.base.platform.service;
 
-import com.ruoyi.info.base.domain.PlatformInfo;
-import com.ruoyi.info.base.domain.vo.PlatformInfoVo;
-import com.ruoyi.info.base.domain.bo.PlatformInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.base.platform.domain.PlatformInfo;
+import com.ruoyi.base.platform.domain.bo.PlatformInfoBo;
+import com.ruoyi.base.platform.domain.vo.PlatformInfoVo;
 
 import java.util.Collection;
 import java.util.List;

ruoyi-info/src/main/java/com/ruoyi/info/base/service/impl/PlatformInfoServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.info.base.service.impl;
+package com.ruoyi.base.platform.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -8,19 +8,28 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.filepathsplicing.FilePathSplicingUtil;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.info.base.domain.PlatformInfo;
-import com.ruoyi.info.base.domain.bo.PlatformInfoBo;
-import com.ruoyi.info.base.domain.vo.PlatformInfoVo;
-import com.ruoyi.info.base.exception.PlatformInfoExceptionEnum;
-import com.ruoyi.info.base.mapper.PlatformInfoMapper;
-import com.ruoyi.info.base.service.IPlatformInfoService;
+import com.ruoyi.base.platform.domain.PlatformInfo;
+import com.ruoyi.base.platform.domain.bo.PlatformInfoBo;
+import com.ruoyi.base.platform.domain.vo.PlatformInfoVo;
+import com.ruoyi.base.platform.exception.PlatformInfoExceptionEnum;
+import com.ruoyi.base.platform.mapper.PlatformInfoMapper;
+import com.ruoyi.base.platform.service.IPlatformInfoService;
 import com.ruoyi.tool.service.JzqService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +45,8 @@ public class PlatformInfoServiceImpl implements IPlatformInfoService {
 
     private final PlatformInfoMapper baseMapper;
     private final JzqService jzqService;
+    @Resource
+    private FilePathSplicingUtil filePathSplicingUtil;
 
     /**
      * 查询平台信息管理分页
@@ -190,7 +201,56 @@ public class PlatformInfoServiceImpl implements IPlatformInfoService {
 
     @Override
     public void organizationCreate() {
-
+        PlatformInfoVo info = getInfo();
+        Map<String, Object> params = new HashMap<>();
+        params.put("name", info.getEnterpriseFullName()); //企业名称
+        params.put("organizationType", "0"); //企业类型
+        params.put("identificationType", "1"); //证件类型
+        params.put("organizationRegNo", info.getUscCode()); //统一社会信用代码
+        params.put("organizationRegImg",downloadSafely(filePathSplicingUtil.getPrefix() + info.getBusinessLicenseImg()));//营业执照图片
+        params.put("legalName", info.getLegalPersonName());//法人姓名
+        params.put("legalIdentityCard", info.getIdCardNumber());//法人身份证号
+        String email = jzqService.organizationCreate(params);
+        if (StringUtils.isNotEmpty(email)) {
+            PlatformInfo update = new PlatformInfo();
+            update.setId(info.getId());
+            update.setEmail(email);
+            baseMapper.updateById(update);
+        }
     }
 
+    /**
+     * 安全下载HTTP图片并转换为File对象
+     * @param imageUrl 图片HTTP地址
+     */
+    public static File downloadSafely(String imageUrl) {
+        try {
+            // 使用系统安全加载器获取临时目录
+            File tmpDir = new File(System.getProperty("java.io.tmpdir"));
+            // 创建安全临时文件
+            File tempFile = File.createTempFile("img_", ".tmp", tmpDir);
+            tempFile.deleteOnExit();  // 程序退出时自动删除
+            // 安全下载机制
+            try {
+                URL url = new URL(imageUrl);
+                ReadableByteChannel rbc = Channels.newChannel(url.openStream());
+                try (FileOutputStream fos = new FileOutputStream(tempFile)) {
+                    fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+                }
+            } catch (IOException e) {
+                // 安全删除失败文件
+                if (tempFile.exists()) {
+                    tempFile.delete();
+                }
+                throw e;
+            }
+            // 验证文件有效性
+            if (tempFile.length() == 0) {
+                throw new IOException("下载文件为空: " + imageUrl);
+            }
+            return tempFile;
+        } catch (Exception e) {
+            return null;
+        }
+    }
 }

ruoyi-info/src/main/java/com/ruoyi/info/base/domain/RevenueSharingConfig.java

@@ -1,14 +1,11 @@
-package com.ruoyi.info.base.domain;
+package com.ruoyi.base.revenue.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 平台分账配置对象 tb_revenue_sharing_config
@@ -23,7 +20,7 @@ public class RevenueSharingConfig extends BaseEntity {
     private static final long serialVersionUID=1L;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Integer id;

ruoyi-info/src/main/java/com/ruoyi/info/base/domain/bo/RevenueSharingConfigBo.java

@@ -1,17 +1,15 @@
-package com.ruoyi.info.base.domain.bo;
+package com.ruoyi.base.revenue.domain.bo;
 
+import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import javax.validation.constraints.*;
-
-import java.util.Date;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 平台分账配置业务对象 tb_revenue_sharing_config

ruoyi-info/src/main/java/com/ruoyi/info/base/domain/vo/RevenueSharingConfigVo.java

@@ -1,14 +1,12 @@
-package com.ruoyi.info.base.domain.vo;
+package com.ruoyi.base.revenue.domain.vo;
 
-import java.math.BigDecimal;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
+
+import java.math.BigDecimal;
 
 
 /**
@@ -25,7 +23,7 @@ public class RevenueSharingConfigVo {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 
+     *
      */
     @ExcelProperty(value = "")
     @ApiModelProperty("")

ruoyi-info/src/main/java/com/ruoyi/info/base/exception/RevenueSharingConfigExceptionEnum.java

@@ -1,6 +1,7 @@
-package com.ruoyi.info.base.exception;
+package com.ruoyi.base.revenue.exception;
 
 import com.ruoyi.common.enums.IIntegerEnum;
+
 import java.util.Objects;
 
 

ruoyi-info/src/main/java/com/ruoyi/info/base/mapper/RevenueSharingConfigMapper.java

@@ -1,8 +1,8 @@
-package com.ruoyi.info.base.mapper;
+package com.ruoyi.base.revenue.mapper;
 
-import com.ruoyi.info.base.domain.RevenueSharingConfig;
-import com.ruoyi.info.base.domain.vo.RevenueSharingConfigVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.base.revenue.domain.RevenueSharingConfig;
+import com.ruoyi.base.revenue.domain.vo.RevenueSharingConfigVo;
 
 /**
  * 平台分账配置Mapper接口

ruoyi-info/src/main/java/com/ruoyi/info/base/service/IRevenueSharingConfigService.java

@@ -1,10 +1,10 @@
-package com.ruoyi.info.base.service;
+package com.ruoyi.base.revenue.service;
 
-import com.ruoyi.info.base.domain.RevenueSharingConfig;
-import com.ruoyi.info.base.domain.vo.RevenueSharingConfigVo;
-import com.ruoyi.info.base.domain.bo.RevenueSharingConfigBo;
-import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.base.revenue.domain.RevenueSharingConfig;
+import com.ruoyi.base.revenue.domain.bo.RevenueSharingConfigBo;
+import com.ruoyi.base.revenue.domain.vo.RevenueSharingConfigVo;
 
 import java.util.Collection;
 import java.util.List;

ruoyi-info/src/main/java/com/ruoyi/info/base/service/impl/RevenueSharingConfigServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.info.base.service.impl;
+package com.ruoyi.base.revenue.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -9,12 +9,12 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.info.base.domain.RevenueSharingConfig;
-import com.ruoyi.info.base.domain.bo.RevenueSharingConfigBo;
-import com.ruoyi.info.base.domain.vo.RevenueSharingConfigVo;
-import com.ruoyi.info.base.exception.RevenueSharingConfigExceptionEnum;
-import com.ruoyi.info.base.mapper.RevenueSharingConfigMapper;
-import com.ruoyi.info.base.service.IRevenueSharingConfigService;
+import com.ruoyi.base.revenue.domain.RevenueSharingConfig;
+import com.ruoyi.base.revenue.domain.bo.RevenueSharingConfigBo;
+import com.ruoyi.base.revenue.domain.vo.RevenueSharingConfigVo;
+import com.ruoyi.base.revenue.exception.RevenueSharingConfigExceptionEnum;
+import com.ruoyi.base.revenue.mapper.RevenueSharingConfigMapper;
+import com.ruoyi.base.revenue.service.IRevenueSharingConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

ruoyi-info/src/main/resources/mapper/PlatformInfoMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.info.base.mapper.PlatformInfoMapper">
+<mapper namespace="com.ruoyi.base.platform.mapper.PlatformInfoMapper">
 
-    <resultMap type="com.ruoyi.info.base.domain.PlatformInfo" id="PlatformInfoResult">
+    <resultMap type="com.ruoyi.base.platform.domain.PlatformInfo" id="PlatformInfoResult">
         <result property="id" column="id"/>
         <result property="enterpriseFullName" column="enterprise_full_name"/>
         <result property="enterpriseAbbreviation" column="enterprise_abbreviation"/>

ruoyi-info/src/main/resources/mapper/RevenueSharingConfigMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.info.base.mapper.RevenueSharingConfigMapper">
+<mapper namespace="com.ruoyi.base.revenue.mapper.RevenueSharingConfigMapper">
 
-    <resultMap type="com.ruoyi.info.base.domain.RevenueSharingConfig" id="RevenueSharingConfigResult">
+    <resultMap type="com.ruoyi.base.revenue.domain.RevenueSharingConfig" id="RevenueSharingConfigResult">
         <result property="id" column="id"/>
         <result property="provinceBusinessRatio" column="province_business_ratio"/>
         <result property="provinceRegionRatio" column="province_region_ratio"/>

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessVo.java

@@ -361,4 +361,10 @@ public class BusinessVo extends BaseVo {
      */
     @ApiModelProperty(value = "是否闭店")
     private Boolean closeStatus;
+
+    /**
+     * 代理收益
+     */
+    @ApiModelProperty(value = "代理收益")
+    private BigDecimal agentIncome;
 }

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

@@ -69,10 +69,10 @@ public class BusinessServiceImpl implements IBusinessService {
             lqw.orderByDesc(Business::getCreateTime);
         }
         Page<BusinessVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        List<BusinessVo> list = result.getRecords();
-        list.forEach(e->{{
-            e.loadBusinessUser();
-        }});
+//        List<BusinessVo> list = result.getRecords();
+//        list.forEach(e->{{
+//            e.loadBusinessUser();
+//        }});
         return TableDataInfo.build(result);
     }
 
@@ -132,38 +132,9 @@ public class BusinessServiceImpl implements IBusinessService {
     private LambdaQueryWrapper<Business> buildQueryWrapper(BusinessBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Business> lqw = Wrappers.lambdaQuery();
-        lqw.select(Business::getBusinessId,
-            Business::getBusinessName,
-            Business::getLocation,
-            Business::getProvinceCode,
-            Business::getCityCode,
-            Business::getAreaCode,
-            Business::getAddress,
-            Business::getProvinceName,
-            Business::getCityName,
-            Business::getAreaName,
-            Business::getEntityName,
-            Business::getTaxNumber,
-            Business::getContactPerson,
-            Business::getContactPhone,
-            Business::getCustomerServicePhone,
-            Business::getBusinessHours,
-            Business::getOrderIndex,
-            Business::getBusinessStatus,
-            Business::getShelvedStatus,
-            Business::getHotStatus,
-            Business::getLogo,
-            Business::getImage,
-            Business::getLongitude,
-            Business::getLatitude,
-            Business::getShareTitle,
-            Business::getShareImage,
-            Business::getCreateTime,
-            Business::getUpdateTime,
-            Business::getCreateBy,
-            Business::getUpdateBy,
-            Business::getAverage,
-            Business::getDelFlag);
+        lqw.eq(bo.getAgentId() != null, Business::getAgentId, bo.getAgentId());
+        lqw.like(StringUtils.isNotBlank(bo.getLegalName()), Business::getLegalName, bo.getLegalName());
+        lqw.eq(bo.getBusinessType() != null, Business::getBusinessType, bo.getBusinessType());
         lqw.like(StringUtils.isNotBlank(bo.getBusinessName()), Business::getBusinessName, bo.getBusinessName());
         lqw.like(StringUtils.isNotBlank(bo.getLocation()), Business::getLocation, bo.getLocation());
         lqw.eq(StringUtils.isNotBlank(bo.getProvinceCode()), Business::getProvinceCode, bo.getProvinceCode());

ruoyi-common/src/main/java/com/ruoyi/common/exception/user/ApiUserException.java

@@ -13,7 +13,8 @@ public enum ApiUserException implements IIntegerEnum {
 
     // TODO 注意检查错误码，保证系统内唯一
     USER_NOT_EXISTS(100001, "用户不存在"),
-    BUSINESS_NOT_EXISTS(100002, "商户不存在");
+    BUSINESS_NOT_EXISTS(100002, "商户不存在"),
+    AGENT_NOT_EXISTS(100003, "代理不存在");
 
     private Integer code;
 

ruoyi-info/pom.xml

@@ -27,10 +27,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-system</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-tool</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

ruoyi-tool/src/main/java/com/ruoyi/tool/config/JzqProperties.java

@@ -45,4 +45,8 @@ public class JzqProperties {
      * 申请签署接口
      */
     private String applySign;
+    /**
+     * 企业实名认证上传
+     */
+    private String organizationCreate;
 }

ruoyi-tool/src/main/java/com/ruoyi/tool/service/JzqService.java

@@ -153,4 +153,14 @@ public class JzqService {
         }
         return response;
     }
+
+    public String organizationCreate(Map<String, Object> params) {
+        RequestUtils requestUtils = RequestUtils.init(jzqProperties.getBaseUrl(), jzqProperties.getAppKey(), jzqProperties.getAppSecret());
+        ResultInfo<String> ri = requestUtils.doPost(jzqProperties.getOcrBusinessLic(), params);
+        log.info("企业实名认证上传：{}", ri.getMsg());
+        if (ri.isSuccess()) {
+            return ri.getData();
+        }
+        return null;
+    }
 }