Date:2025-07-31

author:chenjr
comment:OP 模块配置修改

Signed-off-by: chenjr <chenjiarong@hake.com>

hake-module-op/hake-module-op-server/pom.xml

@@ -17,7 +17,17 @@
     </description>
 
     <dependencies>
-        <!-- Spring Cloud 基础 -->
+        <!-- MyBatis-Plus 代码生成器 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>3.5.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.32</version>
+        </dependency>
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>hake-spring-boot-starter-env</artifactId>
@@ -143,6 +153,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/OpServerApplication.java

@@ -1,5 +1,6 @@
 package cn.iocoder.hake.module.op;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @since 2025-07-30
  */
 @SpringBootApplication
+@MapperScan("cn.iocoder.hake.module.op.dao.mapper")
 public class OpServerApplication {
 
     public static void main(String[] args) {

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/biz/merchant/OpEnterPieceManagementBiz.java

@@ -0,0 +1,34 @@
+package cn.iocoder.hake.module.op.biz.merchant;
+
+import cn.iocoder.hake.module.op.dao.idao.OpEnterPieceManagementDao;
+import cn.iocoder.hake.module.op.entity.OpEnterPieceManagementEntity;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 进件管理 服务类
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpEnterPieceManagementBiz {
+
+    @Autowired
+    private OpEnterPieceManagementDao opEnterPieceManagementDao;
+
+
+    /**
+     * 获取字符串
+     *
+     * @return String
+     */
+    public List<OpEnterPieceManagementEntity> getString() {
+        return opEnterPieceManagementDao.list();
+    }
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/biz/merchant/OpLegalEntityIdCardInfoBiz.java

@@ -0,0 +1,16 @@
+package cn.iocoder.hake.module.op.biz.merchant;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 法人身份证信息 服务类
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpLegalEntityIdCardInfoBiz {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/biz/merchant/OpMerchantInfoBiz.java

@@ -0,0 +1,17 @@
+package cn.iocoder.hake.module.op.biz.merchant;
+
+
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 商户信息 服务类
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpMerchantInfoBiz{
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/biz/merchant/OpMerchantListBiz.java

@@ -0,0 +1,16 @@
+package cn.iocoder.hake.module.op.biz.merchant;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 商户列表 服务类
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpMerchantListBiz {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/biz/merchant/OpSettlementAccountBiz.java

@@ -0,0 +1,17 @@
+package cn.iocoder.hake.module.op.biz.merchant;
+
+
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 结算账户 服务类
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpSettlementAccountBiz {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/biz/merchant/OpSettlementRulesBiz.java

@@ -0,0 +1,17 @@
+package cn.iocoder.hake.module.op.biz.merchant;
+
+
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 结算规则 服务类
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpSettlementRulesBiz{
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/biz/merchant/OpStoreManagementBiz.java

@@ -0,0 +1,17 @@
+package cn.iocoder.hake.module.op.biz.merchant;
+
+
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 门店管理 服务类
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpStoreManagementBiz {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/controller/merchant/OpEnterPieceManagementController.java

@@ -0,0 +1,36 @@
+package cn.iocoder.hake.module.op.controller.merchant;
+
+import cn.iocoder.hake.framework.common.pojo.CommonResult;
+import cn.iocoder.hake.module.op.biz.merchant.OpEnterPieceManagementBiz;
+import cn.iocoder.hake.module.op.entity.OpEnterPieceManagementEntity;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 进件管理 前端控制器
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@RestController
+@RequestMapping("/op/merchant")
+public class OpEnterPieceManagementController {
+
+    @Autowired
+    private OpEnterPieceManagementBiz opEnterPieceManagementBiz;
+
+    @PostMapping("/test")
+    @Operation(summary = "测试ruoyi框架请求")
+    //@PreAuthorize("@ss.hasPermission('mp:account:create')")
+    public CommonResult<List<OpEnterPieceManagementEntity>> getString() {
+        return CommonResult.success(opEnterPieceManagementBiz.getString());
+
+    }
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/controller/merchant/OpLegalEntityIdCardInfoController.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.controller.merchant;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 法人身份证信息 前端控制器
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@RestController
+@RequestMapping("/op/merchant")
+public class OpLegalEntityIdCardInfoController {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/controller/merchant/OpMerchantInfoController.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.controller.merchant;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 商户信息 前端控制器
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@RestController
+@RequestMapping("/op/merchant")
+public class OpMerchantInfoController {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/controller/merchant/OpMerchantListController.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.controller.merchant;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 商户列表 前端控制器
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@RestController
+@RequestMapping("/op/merchant")
+public class OpMerchantListController {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/controller/merchant/OpSettlementAccountController.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.controller.merchant;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 结算账户 前端控制器
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@RestController
+@RequestMapping("/op/merchant")
+public class OpSettlementAccountController {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/controller/merchant/OpSettlementRulesController.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.controller.merchant;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 结算规则 前端控制器
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@RestController
+@RequestMapping("/op/merchant")
+public class OpSettlementRulesController {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/controller/merchant/OpStoreManagementController.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.controller.merchant;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 门店管理 前端控制器
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@RestController
+@RequestMapping("/op/merchant")
+public class OpStoreManagementController {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/idao/OpEnterPieceManagementDao.java

@@ -0,0 +1,19 @@
+package cn.iocoder.hake.module.op.dao.idao;
+
+import cn.iocoder.hake.module.op.dao.mapper.OpEnterPieceManagementMapper;
+import cn.iocoder.hake.module.op.entity.OpEnterPieceManagementEntity;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 进件管理Dao
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpEnterPieceManagementDao extends ServiceImpl<OpEnterPieceManagementMapper, OpEnterPieceManagementEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/idao/OpLegalEntityIdCardInfoDao.java

@@ -0,0 +1,19 @@
+package cn.iocoder.hake.module.op.dao.idao;
+
+import cn.iocoder.hake.module.op.dao.mapper.OpLegalEntityIdCardInfoMapper;
+import cn.iocoder.hake.module.op.entity.OpLegalEntityIdCardInfoEntity;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * <p>
+ * 法人身份证信息Dao
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Component
+public class OpLegalEntityIdCardInfoDao extends ServiceImpl<OpLegalEntityIdCardInfoMapper, OpLegalEntityIdCardInfoEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/idao/OpMerchantInfoDao.java

@@ -0,0 +1,19 @@
+package cn.iocoder.hake.module.op.dao.idao;
+
+import cn.iocoder.hake.module.op.dao.mapper.OpMerchantInfoMapper;
+import cn.iocoder.hake.module.op.entity.OpMerchantInfoEntity;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 商户信息Dao
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public class OpMerchantInfoDao extends ServiceImpl<OpMerchantInfoMapper, OpMerchantInfoEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/idao/OpMerchantListDao.java

@@ -0,0 +1,19 @@
+package cn.iocoder.hake.module.op.dao.idao;
+
+import cn.iocoder.hake.module.op.dao.mapper.OpMerchantListMapper;
+import cn.iocoder.hake.module.op.entity.OpMerchantListEntity;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 商户列表Dao
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public class OpMerchantListDao extends ServiceImpl<OpMerchantListMapper, OpMerchantListEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/idao/OpSettlementAccountDao.java

@@ -0,0 +1,19 @@
+package cn.iocoder.hake.module.op.dao.idao;
+
+import cn.iocoder.hake.module.op.dao.mapper.OpSettlementAccountMapper;
+import cn.iocoder.hake.module.op.entity.OpSettlementAccountEntity;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 结算账户Dao
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public class OpSettlementAccountDao extends ServiceImpl<OpSettlementAccountMapper, OpSettlementAccountEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/idao/OpSettlementRulesDao.java

@@ -0,0 +1,19 @@
+package cn.iocoder.hake.module.op.dao.idao;
+
+import cn.iocoder.hake.module.op.dao.mapper.OpSettlementRulesMapper;
+import cn.iocoder.hake.module.op.entity.OpSettlementRulesEntity;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 结算规则 Dao
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public class OpSettlementRulesDao extends ServiceImpl<OpSettlementRulesMapper, OpSettlementRulesEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/idao/OpStoreManagementDao.java

@@ -0,0 +1,19 @@
+package cn.iocoder.hake.module.op.dao.idao;
+
+import cn.iocoder.hake.module.op.dao.mapper.OpStoreManagementMapper;
+import cn.iocoder.hake.module.op.entity.OpStoreManagementEntity;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.mapstruct.Mapper;
+
+/**
+ * <p>
+ * 门店管理Dao
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public class OpStoreManagementDao extends ServiceImpl<OpStoreManagementMapper, OpStoreManagementEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/mapper/OpEnterPieceManagementMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.dao.mapper;
+
+import cn.iocoder.hake.module.op.entity.OpEnterPieceManagementEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 进件管理 Mapper 接口
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public interface OpEnterPieceManagementMapper extends BaseMapper<OpEnterPieceManagementEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/mapper/OpLegalEntityIdCardInfoMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.dao.mapper;
+
+import cn.iocoder.hake.module.op.entity.OpLegalEntityIdCardInfoEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 法人身份证信息 Mapper 接口
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public interface OpLegalEntityIdCardInfoMapper extends BaseMapper<OpLegalEntityIdCardInfoEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/mapper/OpMerchantInfoMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.dao.mapper;
+
+import cn.iocoder.hake.module.op.entity.OpMerchantInfoEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 商户信息 Mapper 接口
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public interface OpMerchantInfoMapper extends BaseMapper<OpMerchantInfoEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/mapper/OpMerchantListMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.dao.mapper;
+
+import cn.iocoder.hake.module.op.entity.OpMerchantListEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 商户列表 Mapper 接口
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public interface OpMerchantListMapper extends BaseMapper<OpMerchantListEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/mapper/OpSettlementAccountMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.dao.mapper;
+
+import cn.iocoder.hake.module.op.entity.OpSettlementAccountEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 结算账户 Mapper 接口
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public interface OpSettlementAccountMapper extends BaseMapper<OpSettlementAccountEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/mapper/OpSettlementRulesMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.dao.mapper;
+
+import cn.iocoder.hake.module.op.entity.OpSettlementRulesEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 结算规则 Mapper 接口
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public interface OpSettlementRulesMapper extends BaseMapper<OpSettlementRulesEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/dao/mapper/OpStoreManagementMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.dao.mapper;
+
+import cn.iocoder.hake.module.op.entity.OpStoreManagementEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 门店管理 Mapper 接口
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper
+public interface OpStoreManagementMapper extends BaseMapper<OpStoreManagementEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/EntityMapper.java

@@ -0,0 +1,25 @@
+package cn.iocoder.hake.module.op.domain;
+
+import java.util.List;
+
+/**
+ * Contract for a generic dto to entity mapper.
+ *
+ * @author Administrator
+ * @param <D> - DTO type parameter.
+ * @param <E> - Entity type parameter.
+ *           接口方法中需要，VO或者DTO对象在前
+ *           数据库对象再后
+ *           否则就是反的
+ */
+
+public interface EntityMapper<D, E> {
+
+    E toEntity(D voOrDto);
+
+    D toVoOrDto(E entity);
+
+    List <E> toEntity(List<D> voOrDtoList);
+
+    List <D> toVoOrDto(List<E> entityList);
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/dto/OpEnterPieceManagementDto.java

@@ -0,0 +1,48 @@
+package cn.iocoder.hake.module.op.domain.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 进件管理
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpEnterPieceManagementDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -5877033724264960699L;
+
+    @Schema(name = "merchantNumber", description = "商户编号")
+    private String merchantNumber;
+
+    @Schema(name = "applyNumber", description = "申请单号")
+    private String applyNumber;
+
+    @Schema(name = "channel", description = "渠道（TODO：暂定0-汇付天下，完善渠道后，补充对应的注释）")
+    private Boolean channel;
+
+    @Schema(name = "productName", description = "进件商户名")
+    private String productName;
+
+    @Schema(name = "merchantType", description = "商户类型(0:个体工商户, 1:企业)")
+    private Boolean merchantType;
+
+    @Schema(name = "channel", description = "提交状态(0-拟稿，1-审核中，2-进件成功)")
+    private String submitStatus;
+
+    @Schema(name = "source", description = "来源(0-运营中心，1-商户系统)")
+    private Boolean source;
+
+    @Schema(name = "submitTime", description = "提交时间")
+    private String submitTime;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/dto/OpLegalEntityIdCardInfoDto.java

@@ -0,0 +1,100 @@
+package cn.iocoder.hake.module.op.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 法人身份证信息
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpLegalEntityIdCardInfoDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 法人身份证人像面照片
+     */
+    private String cardFrontPhoto;
+
+    /**
+     * 法人身份证国徽面照片
+     */
+    private String cardReversePhoto;
+
+    /**
+     * 法人身份证姓名
+     */
+    private String cardName;
+
+    /**
+     * 法人身份证号
+     */
+    private String cardNumber;
+
+    /**
+     * 法人身份证起始有效时间
+     */
+    private String startDate;
+
+    /**
+     * 法人身份证结束有效时间
+     */
+    private String endDate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/dto/OpMerchantInfoDto.java

@@ -0,0 +1,101 @@
+package cn.iocoder.hake.module.op.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商户信息
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpMerchantInfoDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 营业执照照片
+     */
+    private String licensePhoto;
+
+    /**
+     * 营业执照编号
+     */
+    private String licenseNumber;
+
+    /**
+     * 商户名称全称
+     */
+    private String merchantFullName;
+
+    /**
+     * 营业执照注册地址
+     */
+    private String registeredAddress;
+
+    /**
+     * 营业执照有效期开始时间
+     */
+    private LocalDate issueDate;
+
+    /**
+     * 营业执照有效期截止时间
+     */
+    private LocalDate expiryDate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/dto/OpMerchantListDto.java

@@ -0,0 +1,135 @@
+package cn.iocoder.hake.module.op.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商户列表
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpMerchantListDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+
+    /**
+     * 登录名
+     */
+    private String loginName;
+
+    /**
+     * 商户简称
+     */
+    private String merchantShortName;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系人邮箱
+     */
+    private String contactEmail;
+
+    /**
+     * 联系人手机号
+     */
+    private Byte contactPhone;
+
+    /**
+     * 商户级别(0:简单模式|M0-页面简洁，仅基础收款功能, 1:高级模式|M1-支持api调用， 支持配置应用及分账、转账功能)
+     */
+    private Boolean merchantLevel;
+
+    /**
+     * 退款方式(0:平台退款, 1:接口退款)
+     */
+    private Boolean refundMethod;
+
+    /**
+     * 商户类型(0:特约商户, 1:普通商户)
+     */
+    private Boolean merchantType;
+
+    /**
+     * 代理商ID
+     */
+    private String agentId;
+
+    /**
+     * 服务商ID
+     */
+    private String serviceId;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/dto/OpSettlementAccountDto.java

@@ -0,0 +1,95 @@
+package cn.iocoder.hake.module.op.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 结算账户
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpSettlementAccountDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 账户类型(0:对私, 1:对公)
+     */
+    private Boolean accountType;
+
+    /**
+     * 开户名称
+     */
+    private String openAccountName;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 开户行
+     */
+    private String openAccountBank;
+
+    /**
+     * 开户行地址
+     */
+    private String bankAddress;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/dto/OpSettlementRulesDto.java

@@ -0,0 +1,105 @@
+package cn.iocoder.hake.module.op.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 结算规则
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpSettlementRulesDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 结算规则信息（todo 目前结算规则业务不完善，待产品确认规则再指定，占坑）
+     */
+    private String settlementInfo;
+
+    /**
+     * 选择行业
+     */
+    private String industry;
+
+    /**
+     * 特殊资质
+     */
+    private String specialQualificationsPhoto;
+
+    /**
+     * 优惠费率活动(0-不参与，1-参与)
+     */
+    private Boolean rateActivity;
+
+    /**
+     * 服务商底价
+     */
+    private String serverBidPrice;
+
+    /**
+     * 代理商费率
+     */
+    private String agentRate;
+
+    /**
+     * 进件费率
+     */
+    private String enterPieceRate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/dto/OpStoreManagementDto.java

@@ -0,0 +1,135 @@
+package cn.iocoder.hake.module.op.domain.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 门店管理
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpStoreManagementDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 门店编号
+     */
+    private String storeNumber;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 联系人电话
+     */
+    private Byte contactPhone;
+
+    /**
+     * 门店LOGO
+     */
+    private String logoPhoto;
+
+    /**
+     * 门店内景照片
+     */
+    private String indoorScenePhoto;
+
+    /**
+     * 门头照片
+     */
+    private String doorSignPhoto;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 城区
+     */
+    private String urbanArea;
+
+    /**
+     * 具体位置
+     */
+    private String specificLocation;
+
+    /**
+     * 经纬度
+     */
+    private String latitudeLongitude;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/mapstruct/OpEnterPieceManagementMapStruct.java

@@ -0,0 +1,16 @@
+package cn.iocoder.hake.module.op.domain.mapstruct;
+
+import cn.iocoder.hake.module.op.domain.EntityMapper;
+import cn.iocoder.hake.module.op.domain.dto.OpEnterPieceManagementDto;
+import cn.iocoder.hake.module.op.entity.OpEnterPieceManagementEntity;
+import org.mapstruct.Mapper;
+
+/**
+ * 进件管理 MapStruct dto 与 entity 转换
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper(componentModel = "spring", uses = {})
+public interface OpEnterPieceManagementMapStruct extends EntityMapper<OpEnterPieceManagementDto, OpEnterPieceManagementEntity> {
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/mapstruct/OpLegalEntityIdCardInfoMapStruct.java

@@ -0,0 +1,24 @@
+package cn.iocoder.hake.module.op.domain.mapstruct;
+
+import cn.iocoder.hake.module.op.domain.EntityMapper;
+import cn.iocoder.hake.module.op.domain.dto.OpEnterPieceManagementDto;
+import cn.iocoder.hake.module.op.entity.OpEnterPieceManagementEntity;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.mapstruct.Mapper;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 法人身份证信息 MapStruct dto 与 entity 转换
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper(componentModel = "spring", uses = {})
+public interface OpLegalEntityIdCardInfoMapStruct extends EntityMapper<OpEnterPieceManagementDto, OpEnterPieceManagementEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/mapstruct/OpMerchantInfoMapStruct.java

@@ -0,0 +1,17 @@
+package cn.iocoder.hake.module.op.domain.mapstruct;
+
+import cn.iocoder.hake.module.op.domain.EntityMapper;
+import cn.iocoder.hake.module.op.domain.dto.OpMerchantInfoDto;
+import cn.iocoder.hake.module.op.entity.OpMerchantInfoEntity;
+import org.mapstruct.Mapper;
+
+
+/**
+ * 商户信息 MapStruct dto 与 entity 转换
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper(componentModel = "spring", uses = {})
+public interface OpMerchantInfoMapStruct extends EntityMapper<OpMerchantInfoDto, OpMerchantInfoEntity> {
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/mapstruct/OpMerchantListMapStruct.java

@@ -0,0 +1,17 @@
+package cn.iocoder.hake.module.op.domain.mapstruct;
+
+import cn.iocoder.hake.module.op.domain.EntityMapper;
+import cn.iocoder.hake.module.op.domain.dto.OpMerchantListDto;
+import cn.iocoder.hake.module.op.entity.OpMerchantListEntity;
+import org.mapstruct.Mapper;
+
+
+/**
+ * 商户列表 MapStruct dto 与 entity 转换
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper(componentModel = "spring", uses = {})
+public interface OpMerchantListMapStruct extends EntityMapper<OpMerchantListDto, OpMerchantListEntity> {
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/mapstruct/OpSettlementAccountMapStruct.java

@@ -0,0 +1,17 @@
+package cn.iocoder.hake.module.op.domain.mapstruct;
+
+import cn.iocoder.hake.module.op.domain.EntityMapper;
+import cn.iocoder.hake.module.op.domain.dto.OpSettlementAccountDto;
+import cn.iocoder.hake.module.op.entity.OpSettlementAccountEntity;
+import org.mapstruct.Mapper;
+
+
+/**
+ * 结算账户 MapStruct dto 与 entity 转换
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper(componentModel = "spring", uses = {})
+public interface OpSettlementAccountMapStruct extends EntityMapper<OpSettlementAccountDto, OpSettlementAccountEntity> {
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/mapstruct/OpSettlementRulesMapStruct.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.domain.mapstruct;
+
+
+import cn.iocoder.hake.module.op.domain.EntityMapper;
+import cn.iocoder.hake.module.op.domain.dto.OpSettlementRulesDto;
+import cn.iocoder.hake.module.op.entity.OpSettlementRulesEntity;
+import org.mapstruct.Mapper;
+
+/**
+ * 结算规则 MapStruct dto 与 entity 转换
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper(componentModel = "spring", uses = {})
+public interface OpSettlementRulesMapStruct extends EntityMapper<OpSettlementRulesDto, OpSettlementRulesEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/mapstruct/OpStoreManagementMapStruct.java

@@ -0,0 +1,18 @@
+package cn.iocoder.hake.module.op.domain.mapstruct;
+
+import cn.iocoder.hake.module.op.domain.EntityMapper;
+import cn.iocoder.hake.module.op.domain.dto.OpStoreManagementDto;
+import cn.iocoder.hake.module.op.entity.OpStoreManagementEntity;
+import org.mapstruct.Mapper;
+
+
+/**
+ * 门店管理 MapStruct dto 与 entity 转换
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Mapper(componentModel = "spring", uses = {})
+public interface OpStoreManagementMapStruct extends EntityMapper<OpStoreManagementDto, OpStoreManagementEntity> {
+
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/vo/OpEnterPieceManagementVo.java

@@ -0,0 +1,115 @@
+package cn.iocoder.hake.module.op.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 进件管理
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpEnterPieceManagementVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 申请单号
+     */
+    private String applyNumber;
+
+    /**
+     * 渠道（TODO：暂定0-汇付天下，完善渠道后，补充对应的注释）
+     */
+    private Boolean channel;
+
+    /**
+     * 进件商户名
+     */
+    private String productName;
+
+    /**
+     * 商户类型(0:个体工商户, 1:企业)
+     */
+    private Boolean merchantType;
+
+    /**
+     * 提交状态(0-拟稿，1-审核中，2-进件成功)
+     */
+    private String submitStatus;
+
+    /**
+     * 来源(0-运营中心，1-商户系统)
+     */
+    private Boolean source;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime submitTime;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 预留字段4
+     */
+    private String reservedField4;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/vo/OpLegalEntityIdCardInfoVo.java

@@ -0,0 +1,100 @@
+package cn.iocoder.hake.module.op.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 法人身份证信息
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpLegalEntityIdCardInfoVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 法人身份证人像面照片
+     */
+    private String cardFrontPhoto;
+
+    /**
+     * 法人身份证国徽面照片
+     */
+    private String cardReversePhoto;
+
+    /**
+     * 法人身份证姓名
+     */
+    private String cardName;
+
+    /**
+     * 法人身份证号
+     */
+    private String cardNumber;
+
+    /**
+     * 法人身份证起始有效时间
+     */
+    private String startDate;
+
+    /**
+     * 法人身份证结束有效时间
+     */
+    private String endDate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/vo/OpMerchantInfoVo.java

@@ -0,0 +1,101 @@
+package cn.iocoder.hake.module.op.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商户信息
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpMerchantInfoVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 营业执照照片
+     */
+    private String licensePhoto;
+
+    /**
+     * 营业执照编号
+     */
+    private String licenseNumber;
+
+    /**
+     * 商户名称全称
+     */
+    private String merchantFullName;
+
+    /**
+     * 营业执照注册地址
+     */
+    private String registeredAddress;
+
+    /**
+     * 营业执照有效期开始时间
+     */
+    private LocalDate issueDate;
+
+    /**
+     * 营业执照有效期截止时间
+     */
+    private LocalDate expiryDate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/vo/OpMerchantListVo.java

@@ -0,0 +1,135 @@
+package cn.iocoder.hake.module.op.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商户列表
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpMerchantListVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+
+    /**
+     * 登录名
+     */
+    private String loginName;
+
+    /**
+     * 商户简称
+     */
+    private String merchantShortName;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系人邮箱
+     */
+    private String contactEmail;
+
+    /**
+     * 联系人手机号
+     */
+    private Byte contactPhone;
+
+    /**
+     * 商户级别(0:简单模式|M0-页面简洁，仅基础收款功能, 1:高级模式|M1-支持api调用， 支持配置应用及分账、转账功能)
+     */
+    private Boolean merchantLevel;
+
+    /**
+     * 退款方式(0:平台退款, 1:接口退款)
+     */
+    private Boolean refundMethod;
+
+    /**
+     * 商户类型(0:特约商户, 1:普通商户)
+     */
+    private Boolean merchantType;
+
+    /**
+     * 代理商ID
+     */
+    private String agentId;
+
+    /**
+     * 服务商ID
+     */
+    private String serviceId;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/vo/OpSettlementAccountVo.java

@@ -0,0 +1,95 @@
+package cn.iocoder.hake.module.op.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 结算账户
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpSettlementAccountVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 账户类型(0:对私, 1:对公)
+     */
+    private Boolean accountType;
+
+    /**
+     * 开户名称
+     */
+    private String openAccountName;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 开户行
+     */
+    private String openAccountBank;
+
+    /**
+     * 开户行地址
+     */
+    private String bankAddress;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/vo/OpSettlementRulesVo.java

@@ -0,0 +1,105 @@
+package cn.iocoder.hake.module.op.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 结算规则
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpSettlementRulesVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 结算规则信息（todo 目前结算规则业务不完善，待产品确认规则再指定，占坑）
+     */
+    private String settlementInfo;
+
+    /**
+     * 选择行业
+     */
+    private String industry;
+
+    /**
+     * 特殊资质
+     */
+    private String specialQualificationsPhoto;
+
+    /**
+     * 优惠费率活动(0-不参与，1-参与)
+     */
+    private Boolean rateActivity;
+
+    /**
+     * 服务商底价
+     */
+    private String serverBidPrice;
+
+    /**
+     * 代理商费率
+     */
+    private String agentRate;
+
+    /**
+     * 进件费率
+     */
+    private String enterPieceRate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/domain/vo/OpStoreManagementVo.java

@@ -0,0 +1,135 @@
+package cn.iocoder.hake.module.op.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 门店管理
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Data
+@Accessors(chain = true)
+public class OpStoreManagementVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 门店编号
+     */
+    private String storeNumber;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 联系人电话
+     */
+    private Byte contactPhone;
+
+    /**
+     * 门店LOGO
+     */
+    private String logoPhoto;
+
+    /**
+     * 门店内景照片
+     */
+    private String indoorScenePhoto;
+
+    /**
+     * 门头照片
+     */
+    private String doorSignPhoto;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 城区
+     */
+    private String urbanArea;
+
+    /**
+     * 具体位置
+     */
+    private String specificLocation;
+
+    /**
+     * 经纬度
+     */
+    private String latitudeLongitude;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/entity/OpEnterPieceManagementEntity.java

@@ -0,0 +1,123 @@
+package cn.iocoder.hake.module.op.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 进件管理
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Getter
+@Setter
+@TableName("op_enter_piece_management")
+@Accessors(chain = true)
+public class OpEnterPieceManagementEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 申请单号
+     */
+    private String applyNumber;
+
+    /**
+     * 渠道（TODO：暂定0-汇付天下，完善渠道后，补充对应的注释）
+     */
+    private Boolean channel;
+
+    /**
+     * 进件商户名
+     */
+    private String productName;
+
+    /**
+     * 商户类型(0:个体工商户, 1:企业)
+     */
+    private Boolean merchantType;
+
+    /**
+     * 提交状态(0-拟稿，1-审核中，2-进件成功)
+     */
+    private String submitStatus;
+
+    /**
+     * 来源(0-运营中心，1-商户系统)
+     */
+    private Boolean source;
+
+    /**
+     * 提交时间
+     */
+    private LocalDateTime submitTime;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 预留字段4
+     */
+    private String reservedField4;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/entity/OpLegalEntityIdCardInfoEntity.java

@@ -0,0 +1,108 @@
+package cn.iocoder.hake.module.op.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 法人身份证信息
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Getter
+@Setter
+@TableName("op_legal_entity_id_card_info")
+@Accessors(chain = true)
+public class OpLegalEntityIdCardInfoEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 法人身份证人像面照片
+     */
+    private String cardFrontPhoto;
+
+    /**
+     * 法人身份证国徽面照片
+     */
+    private String cardReversePhoto;
+
+    /**
+     * 法人身份证姓名
+     */
+    private String cardName;
+
+    /**
+     * 法人身份证号
+     */
+    private String cardNumber;
+
+    /**
+     * 法人身份证起始有效时间
+     */
+    private String startDate;
+
+    /**
+     * 法人身份证结束有效时间
+     */
+    private String endDate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/entity/OpMerchantInfoEntity.java

@@ -0,0 +1,109 @@
+package cn.iocoder.hake.module.op.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商户信息
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Getter
+@Setter
+@TableName("op_merchant_info")
+@Accessors(chain = true)
+public class OpMerchantInfoEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 营业执照照片
+     */
+    private String licensePhoto;
+
+    /**
+     * 营业执照编号
+     */
+    private String licenseNumber;
+
+    /**
+     * 商户名称全称
+     */
+    private String merchantFullName;
+
+    /**
+     * 营业执照注册地址
+     */
+    private String registeredAddress;
+
+    /**
+     * 营业执照有效期开始时间
+     */
+    private LocalDate issueDate;
+
+    /**
+     * 营业执照有效期截止时间
+     */
+    private LocalDate expiryDate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/entity/OpMerchantListEntity.java

@@ -0,0 +1,143 @@
+package cn.iocoder.hake.module.op.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 商户列表
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Getter
+@Setter
+@TableName("op_merchant_list")
+@Accessors(chain = true)
+public class OpMerchantListEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 商户名称
+     */
+    private String merchantName;
+
+    /**
+     * 登录名
+     */
+    private String loginName;
+
+    /**
+     * 商户简称
+     */
+    private String merchantShortName;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系人邮箱
+     */
+    private String contactEmail;
+
+    /**
+     * 联系人手机号
+     */
+    private Byte contactPhone;
+
+    /**
+     * 商户级别(0:简单模式|M0-页面简洁，仅基础收款功能, 1:高级模式|M1-支持api调用， 支持配置应用及分账、转账功能)
+     */
+    private Boolean merchantLevel;
+
+    /**
+     * 退款方式(0:平台退款, 1:接口退款)
+     */
+    private Boolean refundMethod;
+
+    /**
+     * 商户类型(0:特约商户, 1:普通商户)
+     */
+    private Boolean merchantType;
+
+    /**
+     * 代理商ID
+     */
+    private String agentId;
+
+    /**
+     * 服务商ID
+     */
+    private String serviceId;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/entity/OpSettlementAccountEntity.java

@@ -0,0 +1,103 @@
+package cn.iocoder.hake.module.op.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 结算账户
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Getter
+@Setter
+@TableName("op_settlement_account")
+@Accessors(chain = true)
+public class OpSettlementAccountEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 账户类型(0:对私, 1:对公)
+     */
+    private Boolean accountType;
+
+    /**
+     * 开户名称
+     */
+    private String openAccountName;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 开户行
+     */
+    private String openAccountBank;
+
+    /**
+     * 开户行地址
+     */
+    private String bankAddress;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/entity/OpSettlementRulesEntity.java

@@ -0,0 +1,113 @@
+package cn.iocoder.hake.module.op.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 结算规则
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Getter
+@Setter
+@TableName("op_settlement_rules")
+@Accessors(chain = true)
+public class OpSettlementRulesEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 进件ID
+     */
+    private String enterPieceId;
+
+    /**
+     * 结算规则信息（todo 目前结算规则业务不完善，待产品确认规则再指定，占坑）
+     */
+    private String settlementInfo;
+
+    /**
+     * 选择行业
+     */
+    private String industry;
+
+    /**
+     * 特殊资质
+     */
+    private String specialQualificationsPhoto;
+
+    /**
+     * 优惠费率活动(0-不参与，1-参与)
+     */
+    private Boolean rateActivity;
+
+    /**
+     * 服务商底价
+     */
+    private String serverBidPrice;
+
+    /**
+     * 代理商费率
+     */
+    private String agentRate;
+
+    /**
+     * 进件费率
+     */
+    private String enterPieceRate;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/entity/OpStoreManagementEntity.java

@@ -0,0 +1,143 @@
+package cn.iocoder.hake.module.op.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 门店管理
+ * </p>
+ *
+ * @author chenjr
+ * @since 2025-07-31
+ */
+@Getter
+@Setter
+@TableName("op_store_management")
+@Accessors(chain = true)
+public class OpStoreManagementEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 商户编号
+     */
+    private String merchantNumber;
+
+    /**
+     * 门店编号
+     */
+    private String storeNumber;
+
+    /**
+     * 门店名称
+     */
+    private String storeName;
+
+    /**
+     * 联系人电话
+     */
+    private Byte contactPhone;
+
+    /**
+     * 门店LOGO
+     */
+    private String logoPhoto;
+
+    /**
+     * 门店内景照片
+     */
+    private String indoorScenePhoto;
+
+    /**
+     * 门头照片
+     */
+    private String doorSignPhoto;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 城区
+     */
+    private String urbanArea;
+
+    /**
+     * 具体位置
+     */
+    private String specificLocation;
+
+    /**
+     * 经纬度
+     */
+    private String latitudeLongitude;
+
+    /**
+     * 备注
+     */
+    private String notes;
+
+    /**
+     * 预留字段1
+     */
+    private String reservedField1;
+
+    /**
+     * 预留字段2
+     */
+    private String reservedField2;
+
+    /**
+     * 预留字段3
+     */
+    private String reservedField3;
+
+    /**
+     * 创建人
+     */
+    private String createdUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 逻辑删除标识 (0:未删除, 1:已删除)
+     */
+    private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
+}

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/framework/config/rpc/RpcConfiguration.java

@@ -1,4 +1,4 @@
-package cn.iocoder.hake.module.op.framework.rpc.config;
+package cn.iocoder.hake.module.op.framework.config.rpc;
 
 import cn.iocoder.hake.module.infra.api.file.FileApi;
 import org.springframework.cloud.openfeign.EnableFeignClients;

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/framework/config/security/SecurityConfiguration.java

@@ -1,4 +1,4 @@
-package cn.iocoder.hake.module.op.framework.security.config;
+package cn.iocoder.hake.module.op.framework.config.security;
 
 import cn.iocoder.hake.framework.security.config.AuthorizeRequestsCustomizer;
 import cn.iocoder.hake.module.system.enums.ApiConstants;

hake-module-op/hake-module-op-server/src/main/java/cn/iocoder/hake/module/op/utils/MyBatisPlusAuto.java

@@ -0,0 +1,64 @@
+package cn.iocoder.hake.module.op.utils;
+
+
+import com.baomidou.mybatisplus.generator.FastAutoGenerator;
+import com.baomidou.mybatisplus.generator.config.OutputFile;
+import com.baomidou.mybatisplus.generator.config.rules.DbColumnType;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine;
+
+import java.sql.Types;
+import java.util.Collections;
+
+/**
+ * @author chenjr
+ * @since 2025-07-31
+ */
+public class MyBatisPlusAuto {
+
+    public static void main(String[] args) {
+        FastAutoGenerator.create("jdbc:mysql://127.0.0.1:3306/hake", "", "")
+                .globalConfig(builder -> {
+                    builder.author("chenjr") // 设置作者
+                            .outputDir(System.getProperty("user.dir") + "/src/main/java/"); // 输出路径
+                })
+                .dataSourceConfig(builder -> {
+                    builder.typeConvertHandler((globalConfig, typeRegistry, metaInfo) -> {
+                        int typeCode = metaInfo.getJdbcType().TYPE_CODE;
+                        if (typeCode == Types.SMALLINT) {
+                            return DbColumnType.INTEGER;
+                        }
+                        return typeRegistry.getColumnType(metaInfo);
+                    });
+                })
+                .packageConfig(builder -> {
+                    builder.parent("cn.iocoder.hake")
+                            .pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper"));
+                })
+                .strategyConfig(builder -> {
+                    builder.entityBuilder()
+                            .naming(NamingStrategy.underline_to_camel)
+                            .columnNaming(NamingStrategy.underline_to_camel)
+                            .enableLombok()
+                            .logicDeleteColumnName("deleted");
+
+                    builder.mapperBuilder()
+                            .enableFileOverride() // 覆盖已有文件（慎用）
+                            .enableBaseResultMap()
+                            .enableBaseColumnList();
+
+                    builder.serviceBuilder()
+                            .formatServiceFileName("%sService")
+                            .formatServiceImplFileName("%sServiceImpl");
+
+                    builder.controllerBuilder()
+                            .enableFileOverride();
+
+                    // 设置需要生成的表名
+                    builder.addInclude("");
+                })
+                // 使用 Freemarker 模板引擎（默认，可省略）
+                .templateEngine(new FreemarkerTemplateEngine())
+                .execute();
+    }
+}

hake-module-op/hake-module-op-server/src/main/resources/application.yaml

@@ -124,5 +124,6 @@ hake:
   tenant: # 多租户相关配置项
     enable: true
     ignore-urls:
+    ignore-tables:
 
 debug: false

hake-module-op/hake-module-op-server/src/main/resources/mapper/OpEnterPieceManagementMapper.xml

@@ -0,0 +1,5 @@
+<?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="cn.iocoder.hake.module.op.dao.mapper.OpEnterPieceManagementMapper">
+
+</mapper>

hake-module-op/hake-module-op-server/src/main/resources/mapper/OpLegalEntityIdCardInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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="cn.iocoder.hake.module.op.dao.mapper.OpLegalEntityIdCardInfoMapper">
+
+</mapper>

hake-module-op/hake-module-op-server/src/main/resources/mapper/OpMerchantInfoMapper.xml

@@ -0,0 +1,4 @@
+<?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="cn.iocoder.hake.module.op.dao.mapper.OpMerchantInfoMapper">
+</mapper>

hake-module-op/hake-module-op-server/src/main/resources/mapper/OpMerchantListMapper.xml

@@ -0,0 +1,5 @@
+<?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="cn.iocoder.hake.module.op.dao.mapper.OpMerchantListMapper">
+
+</mapper>

hake-module-op/hake-module-op-server/src/main/resources/mapper/OpSettlementAccountMapper.xml

@@ -0,0 +1,5 @@
+<?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="cn.iocoder.hake.module.op.dao.mapper.OpSettlementAccountMapper">
+
+</mapper>

hake-module-op/hake-module-op-server/src/main/resources/mapper/OpSettlementRulesMapper.xml

@@ -0,0 +1,4 @@
+<?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="cn.iocoder.hake.module.op.dao.mapper.OpSettlementRulesMapper">
+</mapper>

hake-module-op/hake-module-op-server/src/main/resources/mapper/OpStoreManagementMapper.xml

@@ -0,0 +1,4 @@
+<?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="cn.iocoder.hake.module.op.dao.mapper.OpStoreManagementMapper">
+</mapper>

hake-module-system/hake-module-system-server/src/main/java/cn/iocoder/hake/module/system/service/auth/AdminAuthServiceImpl.java

@@ -101,16 +101,16 @@ public class AdminAuthServiceImpl implements AdminAuthService {
     @Override
     public AuthLoginRespVO login(AuthLoginReqVO reqVO) {
         // 校验验证码
-        validateCaptcha(reqVO);
+        //validateCaptcha(reqVO);
 
         // 使用账号密码，进行登录
         AdminUserDO user = authenticate(reqVO.getUsername(), reqVO.getPassword());
 
         // 如果 socialType 非空，说明需要绑定社交用户
-        if (reqVO.getSocialType() != null) {
+        //if (reqVO.getSocialType() != null) {
-            socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
+        //    socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
-                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState()));
+        //            reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState()));
-        }
+        //}
         // 创建 Token 令牌，记录登录日志
         return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME);
     }

sql/mysql/2.0/op.sql

@@ -20,14 +20,15 @@ CREATE TABLE IF NOT EXISTS `op_merchant_list`  (
     `agent_id` varchar(64) NULL DEFAULT '' COMMENT '代理商ID',
     `service_id` varchar(64) NULL DEFAULT '' COMMENT '服务商ID',
     `notes` varchar(256) NULL DEFAULT NULL COMMENT '备注',
-    `reserved_field_1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
-    `reserved_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
-    `reserved_field_3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
+    `reserved_field3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
     `created_user` VARCHAR(64) NOT NULL COMMENT '创建人',
     `created_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_user` VARCHAR(64) NOT NULL COMMENT '更新人',
     `updated_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `is_deleted` TINYINT(1) DEFAULT 0 NOT NULL COMMENT '逻辑删除标识 (0:未删除, 1:已删除)',
+    `tenant_id` bigint NOT NULL DEFAULT 1 COMMENT '租户编号',
     INDEX idx_is_deleted (is_deleted), -- 为逻辑删除字段创建索引，提高查询性能
     INDEX idx_merchant_number (merchant_number) -- 商户编号创建索引、提高查询性能
     ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商户列表';
@@ -53,14 +54,15 @@ CREATE TABLE IF NOT EXISTS `op_store_management`  (
     `specific_location` varchar(64) NULL DEFAULT '' COMMENT '具体位置',
     `latitude_longitude` varchar(32) NULL DEFAULT '' COMMENT '经纬度',
     `customer_service_phone` varchar(256) NULL DEFAULT NULL COMMENT '客服电话',
-    `reserved_field_1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
-    `reserved_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
-    `reserved_field_3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
+    `reserved_field3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
     `created_user` VARCHAR(64) NOT NULL COMMENT '创建人',
     `created_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_user` VARCHAR(64) NOT NULL COMMENT '更新人',
     `updated_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `is_deleted` TINYINT(1) DEFAULT 0 NOT NULL COMMENT '逻辑删除标识 (0:未删除, 1:已删除)',
+    `tenant_id` bigint NOT NULL DEFAULT 1 COMMENT '租户编号',
     INDEX idx_is_deleted (is_deleted), -- 为逻辑删除字段创建索引，提高查询性能
     INDEX idx_merchant_number (merchant_number) -- 商户编号创建索引、提高查询性能
     ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '门店管理';
@@ -79,15 +81,16 @@ CREATE TABLE IF NOT EXISTS `op_enter_piece_management`  (
     `submit_status` varchar(64) NULL DEFAULT '' COMMENT '提交状态(0-拟稿，1-审核中，2-进件成功)',
     `source` TINYINT(1) DEFAULT 0  COMMENT '来源(0-运营中心，1-商户系统)',
     `submit_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '' COMMENT '提交时间',
-    `reserved_field_1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
-    `reserved_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
-    `reserved_field_3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
+    `reserved_field3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
-    `reserved_field_4` varchar(64) NULL DEFAULT NULL COMMENT '预留字段4',
+    `reserved_field4` varchar(64) NULL DEFAULT NULL COMMENT '预留字段4',
     `created_user` VARCHAR(64) NOT NULL COMMENT '创建人',
     `created_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_user` VARCHAR(64) NOT NULL COMMENT '更新人',
     `updated_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `is_deleted` TINYINT(1) DEFAULT 0 NOT NULL COMMENT '逻辑删除标识 (0:未删除, 1:已删除)',
+    `tenant_id` bigint NOT NULL DEFAULT 1 COMMENT '租户编号',
     INDEX idx_is_deleted (is_deleted), -- 为逻辑删除字段创建索引，提高查询性能
     INDEX idx_merchant_number (merchant_number) -- 商户编号创建索引、提高查询性能
     ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '进件管理';
@@ -105,13 +108,14 @@ CREATE TABLE IF NOT EXISTS `op_merchant_info`  (
     `registered_address` varchar(64)  NOT NULL DEFAULT '' COMMENT '营业执照注册地址',
     `issue_date` DATE COMMENT '营业执照有效期开始时间',
     `expiry_date` DATE COMMENT '营业执照有效期截止时间',
-    `reserved_field_1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
-    `reserved_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
     `created_user` VARCHAR(64) NOT NULL COMMENT '创建人',
     `created_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_user` VARCHAR(64) NOT NULL COMMENT '更新人',
     `updated_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `is_deleted` TINYINT(1) DEFAULT 0 NOT NULL COMMENT '逻辑删除标识 (0:未删除, 1:已删除)',
+    `tenant_id` bigint NOT NULL DEFAULT 1 COMMENT '租户编号',
     INDEX idx_is_deleted (is_deleted), -- 为逻辑删除字段创建索引，提高查询性能
     INDEX idx_enter_piece_id (enter_piece_id) -- 进件Id创建索引、提高查询性能
     ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '商户信息';
@@ -131,13 +135,14 @@ CREATE TABLE IF NOT EXISTS `op_legal_entity_id_card_info`  (
     `card_number` varchar(32)  NOT NULL DEFAULT '' COMMENT '法人身份证号',
     `start_date` varchar(32)  NOT NULL DEFAULT '' COMMENT '法人身份证起始有效时间',
     `end_date` varchar(32)  NOT NULL DEFAULT '' COMMENT '法人身份证结束有效时间',
-    `reserved_field_1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
-    `reserved_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
     `created_user` VARCHAR(64) NOT NULL COMMENT '创建人',
     `created_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_user` VARCHAR(64) NOT NULL COMMENT '更新人',
     `updated_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `is_deleted` TINYINT(1) DEFAULT 0 NOT NULL COMMENT '逻辑删除标识 (0:未删除, 1:已删除)',
+    `tenant_id` bigint NOT NULL DEFAULT 1 COMMENT '租户编号',
     INDEX idx_is_deleted (is_deleted), -- 为逻辑删除字段创建索引，提高查询性能
     INDEX idx_enter_piece_id (enter_piece_id) -- 进件Id创建索引、提高查询性能
     ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '法人身份证信息';
@@ -156,22 +161,23 @@ CREATE TABLE IF NOT EXISTS `op_settlement_rules`  (
     `server_bid_price` varchar(32)  NOT NULL DEFAULT '' COMMENT '服务商底价',
     `agent_rate` varchar(32)  NOT NULL DEFAULT '' COMMENT '代理商费率',
     `enter_piece_rate` varchar(64) NULL DEFAULT NULL COMMENT '进件费率',
-    `reserved_field_1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
-    `reserved_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
     `created_user` VARCHAR(64) NOT NULL COMMENT '创建人',
     `created_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_user` VARCHAR(64) NOT NULL COMMENT '更新人',
     `updated_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `is_deleted` TINYINT(1) DEFAULT 0 NOT NULL COMMENT '逻辑删除标识 (0:未删除, 1:已删除)',
+    `tenant_id` bigint NOT NULL DEFAULT 1 COMMENT '租户编号',
     INDEX idx_is_deleted (is_deleted), -- 为逻辑删除字段创建索引，提高查询性能
     INDEX idx_enter_piece_id (enter_piece_id) -- 进件Id创建索引、提高查询性能
     ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '结算规则';
 
 -- ----------------------------
--- Table structure for op_legal_entity_id_card_info
+-- Table structure for op_settlement_account
 -- ----------------------------
 
-CREATE TABLE IF NOT EXISTS `op_legal_entity_id_card_info`  (
+CREATE TABLE IF NOT EXISTS `op_settlement_account`  (
     `id` INT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
     `enter_piece_id` varchar(32)  NOT NULL DEFAULT '' COMMENT '进件ID',
     `account_type` TINYINT(1) DEFAULT 0 COMMENT '账户类型(0:对私, 1:对公)',
@@ -179,13 +185,14 @@ CREATE TABLE IF NOT EXISTS `op_legal_entity_id_card_info`  (
     `bank_account` varchar(32)  NOT NULL DEFAULT '' COMMENT '银行账号',
     `open_account_bank` varchar(32)  NOT NULL DEFAULT '' COMMENT '开户行',
     `bank_address` varchar(32)  NOT NULL DEFAULT '' COMMENT '开户行地址',
-    `reserved_field_1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
-    `reserved_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
     `created_user` VARCHAR(64) NOT NULL COMMENT '创建人',
     `created_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_user` VARCHAR(64) NOT NULL COMMENT '更新人',
     `updated_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     `is_deleted` TINYINT(1) DEFAULT 0 NOT NULL COMMENT '逻辑删除标识 (0:未删除, 1:已删除)',
+    `tenant_id` bigint NOT NULL DEFAULT 1 COMMENT '租户编号',
     INDEX idx_is_deleted (is_deleted), -- 为逻辑删除字段创建索引，提高查询性能
     INDEX idx_enter_piece_id (enter_piece_id) -- 进件Id创建索引、提高查询性能
     ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '结算账户';