Date:2025-07-31

author:chenjr
comment:OP 模块配置、业务层、控制层、dao层构建规范调整

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

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

@@ -1,7 +1,12 @@
 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>
  * 进件管理 服务类
@@ -13,13 +18,17 @@ import org.springframework.stereotype.Component;
 @Component
 public class OpEnterPieceManagementBiz {
 
+    @Autowired
+    private OpEnterPieceManagementDao opEnterPieceManagementDao;
+
+
     /**
      * 获取字符串
      *
      * @return String
      */
-    public String getString() {
-        return "请求成功";
+    public List<OpEnterPieceManagementEntity> getString() {
+        return opEnterPieceManagementDao.list();
     }
 
 }

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

@@ -2,17 +2,14 @@ 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.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
-import static cn.iocoder.hake.framework.common.pojo.CommonResult.success;
+import java.util.List;
 
 /**
  * <p>
@@ -32,7 +29,8 @@ public class OpEnterPieceManagementController {
     @PostMapping("/test")
     @Operation(summary = "测试ruoyi框架请求")
     //@PreAuthorize("@ss.hasPermission('mp:account:create')")
-    public CommonResult<String> getString() {
-        return success(opEnterPieceManagementBiz.getString());
+    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/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

@@ -2,6 +2,7 @@ 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>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @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

@@ -2,6 +2,7 @@ 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>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @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

@@ -2,6 +2,7 @@ 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>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @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

@@ -2,6 +2,7 @@ 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>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @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

@@ -2,6 +2,7 @@ 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>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @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

@@ -2,6 +2,7 @@ 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>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @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

@@ -2,6 +2,7 @@ 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>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @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

@@ -15,11 +15,11 @@ import java.util.List;
 
 public interface EntityMapper<D, E> {
 
-    E toDBEntity(D voOrDto);
+    E toEntity(D voOrDto);
 
-    D toVoOrDto(E dBEntity);
+    D toVoOrDto(E entity);
 
-    List <E> toDBEntity(List<D> voOrDtoList);
+    List <E> toEntity(List<D> voOrDtoList);
 
-    List <D> toVoOrDto(List<E> dBEntityList);
+    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

@@ -6,7 +6,6 @@ import lombok.experimental.Accessors;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -45,5 +44,5 @@ public class OpEnterPieceManagementDto implements Serializable {
     private Boolean source;
 
     @Schema(name = "submitTime", description = "提交时间")
-    private LocalDateTime submitTime;
+    private String submitTime;
 }

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

@@ -3,10 +3,12 @@ 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 java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -19,6 +21,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("op_enter_piece_management")
+@Accessors(chain = true)
 public class OpEnterPieceManagementEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -113,4 +116,8 @@ public class OpEnterPieceManagementEntity implements Serializable {
      * 逻辑删除标识 (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

@@ -3,10 +3,12 @@ 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 java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -19,6 +21,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("op_legal_entity_id_card_info")
+@Accessors(chain = true)
 public class OpLegalEntityIdCardInfoEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -98,4 +101,8 @@ public class OpLegalEntityIdCardInfoEntity implements Serializable {
      * 逻辑删除标识 (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

@@ -3,11 +3,13 @@ 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;
-import lombok.Getter;
-import lombok.Setter;
 
 /**
  * <p>
@@ -20,6 +22,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("op_merchant_info")
+@Accessors(chain = true)
 public class OpMerchantInfoEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -99,4 +102,8 @@ public class OpMerchantInfoEntity implements Serializable {
      * 逻辑删除标识 (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

@@ -3,14 +3,13 @@ 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 java.io.Serializable;
-import java.time.LocalDateTime;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 商户列表
@@ -137,4 +136,8 @@ public class OpMerchantListEntity implements Serializable {
      * 逻辑删除标识 (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

@@ -3,10 +3,12 @@ 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 java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -19,6 +21,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("op_settlement_account")
+@Accessors(chain = true)
 public class OpSettlementAccountEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -93,4 +96,8 @@ public class OpSettlementAccountEntity implements Serializable {
      * 逻辑删除标识 (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

@@ -3,10 +3,12 @@ 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 java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -19,6 +21,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("op_settlement_rules")
+@Accessors(chain = true)
 public class OpSettlementRulesEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -103,4 +106,8 @@ public class OpSettlementRulesEntity implements Serializable {
      * 逻辑删除标识 (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

@@ -3,10 +3,12 @@ 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 java.io.Serializable;
-import java.time.LocalDateTime;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -19,6 +21,7 @@ import lombok.Setter;
 @Getter
 @Setter
 @TableName("op_store_management")
+@Accessors(chain = true)
 public class OpStoreManagementEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -133,4 +136,8 @@ public class OpStoreManagementEntity implements Serializable {
      * 逻辑删除标识 (0:未删除, 1:已删除)
      */
     private Boolean isDeleted;
+    /**
+     * 租户编号
+     */
+    private Integer tenantId;
 }

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", "root", "hk1234")
+                .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("op_enter_piece_management","op_legal_entity_id_card_info","op_merchant_info","op_settlement_rules","op_store_management","op_settlement_account");
+                })
+                // 使用 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-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) {
-            socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
-                    reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState()));
-        }
+        //if (reqVO.getSocialType() != null) {
+        //    socialUserService.bindSocialUser(new SocialUserBindReqDTO(user.getId(), getUserType().getValue(),
+        //            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_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
-    `reserved_field_3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `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_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
-    `reserved_field_3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `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_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
-    `reserved_field_3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
-    `reserved_field_4` varchar(64) NULL DEFAULT NULL COMMENT '预留字段4',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `reserved_field2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field3` varchar(64) NULL DEFAULT NULL COMMENT '预留字段3',
+    `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_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `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_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `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,13 +161,14 @@ 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_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `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 = '结算规则';
@@ -179,13 +185,14 @@ CREATE TABLE IF NOT EXISTS `op_settlement_account`  (
     `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_field_2` varchar(64) NULL DEFAULT NULL COMMENT '预留字段2',
+    `reserved_field1` varchar(64) NULL DEFAULT NULL COMMENT '预留字段1',
+    `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 = '结算账户';