first commit

src/main/java/com/czg/mergedata/MergeDataApplication.java

@@ -0,0 +1,16 @@
+package com.czg.mergedata;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author GY_Joker
+ */
+@SpringBootApplication
+public class MergeDataApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MergeDataApplication.class, args);
+    }
+
+}

src/main/java/com/czg/mergedata/common/config/CurDataSourceConfig.java

@@ -0,0 +1,38 @@
+package com.czg.mergedata.common.config;
+
+import com.zaxxer.hikari.HikariDataSource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+/**
+ * @author GYJoker
+ */
+@Configuration
+@MapperScan(basePackages = "com.czg.mergedata.cur.mapper", sqlSessionFactoryRef = "curEntityManagerFactory")
+public class CurDataSourceConfig {
+    @Primary
+    @Bean(name = "curDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.cur")
+    public DataSource primaryDataSource() {
+        return DataSourceBuilder.create().type(HikariDataSource.class).build();
+    }
+
+    @Primary
+    @Bean(name = "curEntityManagerFactory")
+    public SqlSessionFactory curSqlSessionFactory(@Qualifier("curDataSource") DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/cur/*.xml"));
+        return sessionFactory.getObject();
+    }
+}

src/main/java/com/czg/mergedata/common/config/OldDataSourceConfig.java

@@ -0,0 +1,38 @@
+package com.czg.mergedata.common.config;
+
+import com.zaxxer.hikari.HikariDataSource;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+/**
+ * @author GYJoker
+ */
+@Configuration
+@MapperScan(basePackages = "com.czg.mergedata.old.mapper", sqlSessionFactoryRef = "oldEntityManagerFactory")
+public class OldDataSourceConfig {
+    @Primary
+    @Bean(name = "oldDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.old")
+    public DataSource oldDataSource() {
+        return DataSourceBuilder.create().type(HikariDataSource.class).build();
+    }
+
+    @Primary
+    @Bean(name = "oldEntityManagerFactory")
+    public SqlSessionFactory oldSqlSessionFactory(@Qualifier("oldDataSource") DataSource dataSource) throws Exception {
+        SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        sessionFactory.setDataSource(dataSource);
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/old/*.xml"));
+        return sessionFactory.getObject();
+    }
+}

src/main/java/com/czg/mergedata/common/utils/CodeGen.java

@@ -0,0 +1,126 @@
+package com.czg.mergedata.common.utils;
+
+import com.mybatisflex.codegen.Generator;
+import com.mybatisflex.codegen.config.*;
+import com.mybatisflex.core.service.IService;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.zaxxer.hikari.HikariDataSource;
+
+/**
+ * 代码生成器
+ * @author GYJoker
+ */
+public class CodeGen {
+    private final static String BASE_URL = "rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com";
+    private final static String PORT = "3306";
+    private final static String USERNAME = "cashier";
+    private final static String PASSWORD = "Cashier@1@";
+    private final static String DATABASE = "czg_cashier";
+    private final static String OLD_DATABASE = "fycashier_test";
+
+    private final static boolean isOldVersion = false;
+//    private final static boolean isOldVersion = true;
+
+    public static void main(String[] args) {
+        //配置数据源
+        HikariDataSource dataSource = new HikariDataSource();
+        dataSource.setJdbcUrl("jdbc:mysql://" + BASE_URL + ":" + PORT + "/" + (isOldVersion ? OLD_DATABASE : DATABASE));
+        dataSource.setUsername(USERNAME);
+        dataSource.setPassword(PASSWORD);
+
+        GlobalConfig globalConfig = createGlobalConfigUseStyle();
+
+        //通过 datasource 和 globalConfig 创建代码生成器
+        Generator generator = new Generator(dataSource, globalConfig);
+
+        //生成代码
+        generator.generate();
+    }
+
+    public static GlobalConfig createGlobalConfigUseStyle() {
+        //创建配置内容
+        GlobalConfig globalConfig = new GlobalConfig();
+
+        //设置根包
+        globalConfig.getPackageConfig()
+                .setBasePackage("com.czg.mergedata" + (isOldVersion ? ".old" : ".cur"));
+
+        ServiceConfig serviceConfig = globalConfig.getServiceConfig();
+        serviceConfig.setSuperClass(IService.class);
+        serviceConfig.setClassSuffix("Service");
+        if (isOldVersion) {
+            serviceConfig.setClassPrefix("Old");
+        } else {
+            serviceConfig.setClassPrefix("Cur");
+        }
+        globalConfig.enableService();
+
+        ServiceImplConfig implConfig = globalConfig.getServiceImplConfig();
+        implConfig.setSuperClass(ServiceImpl.class);
+        implConfig.setClassSuffix("Impl");
+        if (isOldVersion) {
+            implConfig.setClassPrefix("Old");
+        } else {
+            implConfig.setClassPrefix("Cur");
+        }
+        globalConfig.enableServiceImpl();
+
+        MapperConfig mapperConfig = globalConfig.getMapperConfig();
+        mapperConfig.setClassSuffix("Mapper");
+        if (isOldVersion) {
+            mapperConfig.setClassPrefix("Old");
+        } else {
+            mapperConfig.setClassPrefix("Cur");
+        }
+        //设置生成 mapper
+        globalConfig.enableMapper();
+
+        globalConfig.setMapperXmlPath((isOldVersion ? "src/main/resources/mapper/old" : "src/main/resources/mapper/cur"));
+        globalConfig.enableMapperXml();
+
+        //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表
+        globalConfig.getStrategyConfig()
+                .setTablePrefix("tb_")
+                .setGenerateTable("tb_shop_staff");
+
+        EntityConfig entityConfig = globalConfig.getEntityConfig();
+        if (isOldVersion) {
+            entityConfig.setClassPrefix("Old");
+        } else {
+            entityConfig.setClassPrefix("Cur");
+        }
+
+        //设置生成 entity 并启用 Lombok
+        globalConfig.enableEntity()
+                .setWithLombok(true)
+                .setJdkVersion(23);
+
+        //可以单独配置某个列
+        ColumnConfig createTime = new ColumnConfig();
+        createTime.setColumnName("create_time");
+        createTime.setOnInsertValue("now()");
+        globalConfig.getStrategyConfig()
+                .setColumnConfig(createTime);
+
+        ColumnConfig updateTime = new ColumnConfig();
+        updateTime.setColumnName("update_time");
+        updateTime.setOnUpdateValue("now()");
+        updateTime.setOnInsertValue("now()");
+        globalConfig.getStrategyConfig()
+                .setColumnConfig(updateTime);
+
+//        ColumnConfig deleted = new ColumnConfig();
+//        deleted.setColumnName("deleted");
+//        deleted.setLogicDelete(true);
+//        globalConfig.getStrategyConfig()
+//                .setColumnConfig(deleted);
+//
+//        ColumnConfig version = new ColumnConfig();
+//        version.setColumnName("version");
+//        version.setVersion(true);
+//        globalConfig.getStrategyConfig()
+//                .setColumnConfig(version);
+
+        return globalConfig;
+    }
+}

src/main/java/com/czg/mergedata/controller/UserController.java

@@ -0,0 +1,12 @@
+package com.czg.mergedata.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author GYJoker
+ */
+@RestController
+@RequestMapping("/user")
+public class UserController {
+}

src/main/java/com/czg/mergedata/cur/entity/CurShopInfo.java

@@ -0,0 +1,281 @@
+package com.czg.mergedata.cur.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 店铺信息 实体类。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_info")
+public class CurShopInfo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 使用系统用户  sys_user id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 主店id
+     */
+    private Integer mainId;
+
+    /**
+     * 店铺口号
+     */
+    private String subTitle;
+
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+
+    /**
+     * 连锁店扩展店名
+     */
+    private String chainName;
+
+    /**
+     * 背景图
+     */
+    private String backImg;
+
+    /**
+     * 门头照
+     */
+    private String frontImg;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 店铺logo
+     */
+    private String logo;
+
+    /**
+     * 封面图
+     */
+    private String coverImg;
+
+    /**
+     * 店铺简介
+     */
+    private String detail;
+
+    /**
+     * 注册类型
+     */
+    private String registerType;
+
+    /**
+     * 店铺类型 单店--only 连锁店--chain--加盟店join （对应原来 type）
+     */
+    private String shopType;
+
+    /**
+     * 管理 0否 1是, 1 为直接管理 可切换店铺 0 不可以切换
+     */
+    private Integer tubeType;
+
+    /**
+     * 营业时间(周开始)
+     */
+    private String businessStartDay;
+
+    /**
+     * 营业时间(周结束)
+     */
+    private String businessEndDay;
+
+    /**
+     * 营业时间
+     */
+    private String businessTime;
+
+    /**
+     * trial试用版，release正式
+     */
+    private String profiles;
+
+    /**
+     * 0停业 1，正常营业 2，网上售卖
+     */
+    private Integer onSale;
+
+    /**
+     * -1 平台禁用 0-过期，1正式营业，
+     */
+    private Integer status;
+
+    /**
+     * 到期时间
+     */
+    private LocalDateTime expireTime;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+    /**
+     * 商家二维码
+     */
+    private String shopQrcode;
+
+    /**
+     * 商家标签
+     */
+    private String tag;
+
+    /**
+     * 经纬度
+     */
+    private String lat;
+
+    /**
+     * 经纬度
+     */
+    private String lng;
+
+    /**
+     * 省
+     */
+    private String provinces;
+
+    /**
+     * 市
+     */
+    private String cities;
+
+    /**
+     * 区/县
+     */
+    private String districts;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 是否允许会员自定义金额 1 允许 0 不允许
+     */
+    private Integer isCustomAmount;
+
+    /**
+     * 是否开启退款密码 1 启用 0 禁用
+     */
+    private Integer isReturnPwd;
+
+    /**
+     * 是否开启会员充值密码 1 启用 0 禁用
+     */
+    private Integer isMemberInPwd;
+
+    /**
+     * 是否开启会员退款密码 1 启用 0 禁用
+     */
+    private Integer isMemberReturnPwd;
+
+    /**
+     * 是否免除桌位费 0否1是
+     */
+    private Integer isTableFee;
+
+    /**
+     * 桌位费
+     */
+    private BigDecimal tableFee;
+
+    /**
+     * 是否启用会员价 0否1是
+     */
+    private Integer isMemberPrice;
+
+    /**
+     * 是否允许会员余额支付
+     */
+    private Integer isAccountPay;
+
+    /**
+     * 积分群体 all-所有 vip-仅针对会员
+     */
+    private String consumeColony;
+
+    /**
+     * 就餐模式  堂食 dine-in  外带 take-out
+     */
+    private String eatModel;
+
+    /**
+     * 小程序码(零点八零首页)
+     */
+    private String smallQrcode;
+
+    /**
+     * 店铺收款码
+     */
+    private String paymentQrcode;
+
+    /**
+     * 台桌预订短信
+     */
+    private String bookingSms;
+
+    /**
+     * 操作密码
+     */
+    private String operationPwd;
+
+    /**
+     * 开票系统账号
+     */
+    private String bindAccount;
+
+    /**
+     * 项目分类
+     */
+    private String article;
+
+    /**
+     * 数电发票类型
+     */
+    private String sdType;
+
+    /**
+     * 税率
+     */
+    private String taxAmount;
+
+}

src/main/java/com/czg/mergedata/cur/entity/CurShopStaff.java

@@ -0,0 +1,91 @@
+package com.czg.mergedata.cur.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 店铺员工 实体类。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_staff")
+public class CurShopStaff implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 使用系统用户 sys_user id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 员工编号
+     */
+    private String code;
+
+    /**
+     * 员工名称
+     */
+    private String name;
+
+    /**
+     * 最大优惠金额
+     */
+    private BigDecimal maxDiscountAmount;
+
+    /**
+     * 优惠类型 1 折扣 0 金额
+     */
+    private String discountType;
+
+    /**
+     * 1启用0不启用
+     */
+    private Boolean status;
+
+    /**
+     * shopId
+     */
+    private Long shopId;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+    /**
+     * master商户账号staff员工
+     */
+    private String type;
+
+    /**
+     * 是否允许管理端登录 0：不允许；1：允许
+     */
+    private Integer isManage;
+
+    /**
+     * 是否允许pc端登录 0：不允许；1：允许
+     */
+    private Integer isPc;
+
+}

src/main/java/com/czg/mergedata/cur/entity/CurSysUser.java

@@ -0,0 +1,111 @@
+package com.czg.mergedata.cur.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 系统用户 实体类。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("sys_user")
+public class CurSysUser implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 账号
+     */
+    private String account;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 头像
+     */
+    private String avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 是否为admin账号
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 状态：1启用、0禁用
+     */
+    private Integer stauts;
+
+    /**
+     * 创建者
+     */
+    private Long createUserId;
+
+    /**
+     * 更新者
+     */
+    private Long updateUserId;
+
+    /**
+     * 修改密码的时间
+     */
+    private LocalDateTime pwdResetTime;
+
+    /**
+     * 创建日期
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/czg/mergedata/cur/mapper/CurShopInfoMapper.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurShopInfo;
+
+/**
+ * 店铺信息 映射层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface CurShopInfoMapper extends BaseMapper<CurShopInfo> {
+
+}

src/main/java/com/czg/mergedata/cur/mapper/CurShopStaffMapper.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurShopStaff;
+
+/**
+ * 店铺员工 映射层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface CurShopStaffMapper extends BaseMapper<CurShopStaff> {
+
+}

src/main/java/com/czg/mergedata/cur/mapper/CurSysUserMapper.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurSysUser;
+
+/**
+ * 系统用户 映射层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface CurSysUserMapper extends BaseMapper<CurSysUser> {
+
+}

src/main/java/com/czg/mergedata/cur/service/CurShopInfoService.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurShopInfo;
+
+/**
+ * 店铺信息 服务层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface CurShopInfoService extends IService<CurShopInfo> {
+
+}

src/main/java/com/czg/mergedata/cur/service/CurShopStaffService.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurShopStaff;
+
+/**
+ * 店铺员工 服务层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface CurShopStaffService extends IService<CurShopStaff> {
+
+}

src/main/java/com/czg/mergedata/cur/service/CurSysUserService.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurSysUser;
+
+/**
+ * 系统用户 服务层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface CurSysUserService extends IService<CurSysUser> {
+
+}

src/main/java/com/czg/mergedata/cur/service/impl/CurShopInfoImpl.java

@@ -0,0 +1,18 @@
+package com.czg.mergedata.cur.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.mergedata.cur.entity.CurShopInfo;
+import com.czg.mergedata.cur.mapper.CurShopInfoMapper;
+import com.czg.mergedata.cur.service.CurShopInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 店铺信息 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Service
+public class CurShopInfoImpl extends ServiceImpl<CurShopInfoMapper, CurShopInfo>  implements CurShopInfoService{
+
+}

src/main/java/com/czg/mergedata/cur/service/impl/CurShopStaffImpl.java

@@ -0,0 +1,18 @@
+package com.czg.mergedata.cur.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.mergedata.cur.entity.CurShopStaff;
+import com.czg.mergedata.cur.mapper.CurShopStaffMapper;
+import com.czg.mergedata.cur.service.CurShopStaffService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 店铺员工 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Service
+public class CurShopStaffImpl extends ServiceImpl<CurShopStaffMapper, CurShopStaff>  implements CurShopStaffService{
+
+}

src/main/java/com/czg/mergedata/cur/service/impl/CurSysUserImpl.java

@@ -0,0 +1,18 @@
+package com.czg.mergedata.cur.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.mergedata.cur.entity.CurSysUser;
+import com.czg.mergedata.cur.mapper.CurSysUserMapper;
+import com.czg.mergedata.cur.service.CurSysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 系统用户 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Service
+public class CurSysUserImpl extends ServiceImpl<CurSysUserMapper, CurSysUser>  implements CurSysUserService{
+
+}

src/main/java/com/czg/mergedata/old/entity/OldPlussShopStaff.java

@@ -0,0 +1,102 @@
+package com.czg.mergedata.old.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_pluss_shop_staff")
+public class OldPlussShopStaff implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增
+     */
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 员工编号
+     */
+    private String code;
+
+    /**
+     * 员工名称
+     */
+    private String name;
+
+    /**
+     * 登录账号
+     */
+    private String account;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 最大优惠金额
+     */
+    private BigDecimal maxDiscountAmount;
+
+    /**
+     * 优惠类型 1 折扣 0 金额
+     */
+    private String discountType;
+
+    /**
+     * 1启用0不启用
+     */
+    private Boolean status;
+
+    /**
+     * 登录端
+     */
+    private String employee;
+
+    /**
+     * shopId
+     */
+    private String shopId;
+
+    private Long createdAt;
+
+    private Long updatedAt;
+
+    /**
+     * master商户账号staff员工
+     */
+    private String type;
+
+    /**
+     * 是否允许管理端登录 0：不允许；1：允许
+     */
+    private Integer isManage;
+
+    /**
+     * 是否允许pc端登录 0：不允许；1：允许
+     */
+    private Integer isPc;
+
+}

src/main/java/com/czg/mergedata/old/entity/OldShopInfo.java

@@ -0,0 +1,355 @@
+package com.czg.mergedata.old.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_info")
+public class OldShopInfo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 主店id
+     */
+    private Integer mainId;
+
+    /**
+     * 店铺帐号
+     */
+    private String account;
+
+    /**
+     * 店铺代号，策略方式为city +店铺号（8位）
+     */
+    private String shopCode;
+
+    /**
+     * 店铺口号
+     */
+    private String subTitle;
+
+    /**
+     * 商户Id
+     */
+    private String merchantId;
+
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+
+    /**
+     * 连锁店扩展店名
+     */
+    private String chainName;
+
+    /**
+     * 背景图
+     */
+    private String backImg;
+
+    /**
+     * 门头照
+     */
+    private String frontImg;
+
+    /**
+     * 联系人姓名
+     */
+    private String contactName;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 店铺log0
+     */
+    private String logo;
+
+    /**
+     * 是否参与代收 0--不参与  1参与 
+     */
+    private Integer isDeposit;
+
+    /**
+     * 是否为供应商
+     */
+    private Integer isSupply;
+
+    /**
+     * 封面图
+     */
+    private String coverImg;
+
+    /**
+     *  店铺分享图
+     */
+    private String shareImg;
+
+    /**
+     * 轮播图
+     */
+    private String view;
+
+    /**
+     * 店铺简介
+     */
+    private String detail;
+
+    /**
+     * 经纬度
+     */
+    private String lat;
+
+    /**
+     * 经纬度
+     */
+    private String lng;
+
+    /**
+     * 未用
+     */
+    private String mchId;
+
+    private String registerType;
+
+    /**
+     * 是否独立的微信小程序
+     */
+    private Integer isWxMaIndependent;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 类似于这种规则51.51.570
+     */
+    private String city;
+
+    /**
+     * 店铺类型 单店--only 连锁店--chain--加盟店join
+     */
+    private String type;
+
+    /**
+     * 管理 0否 1是
+     */
+    private Integer tubeType;
+
+    /**
+     * 行业
+     */
+    private String industry;
+
+    /**
+     * 行业名称
+     */
+    private String industryName;
+
+    /**
+     * 营业时间(周开始)
+     */
+    private String businessStartDay;
+
+    /**
+     * 营业时间(周结束)
+     */
+    private String businessEndDay;
+
+    /**
+     * 营业时间
+     */
+    private String businessTime;
+
+    /**
+     * 配送时间
+     */
+    private String postTime;
+
+    private BigDecimal postAmountLine;
+
+    /**
+     * 0停业1，正常营业,网上售卖
+     */
+    private Integer onSale;
+
+    /**
+     * 0今日，1次日
+     */
+    private Integer settleType;
+
+    /**
+     * 时间
+     */
+    private String settleTime;
+
+    /**
+     * 入驻时间
+     */
+    private Integer enterAt;
+
+    /**
+     * 到期时间
+     */
+    private Long expireAt;
+
+    /**
+     * -1 平台禁用 0-过期，1正式营业，
+     */
+    private Integer status;
+
+    /**
+     * 人均消费
+     */
+    private Float average;
+
+    /**
+     * 订单等待时间
+     */
+    private Integer orderWaitPayMinute;
+
+    /**
+     * 支持登陆设备个数
+     */
+    private Integer supportDeviceNumber;
+
+    /**
+     * 分销层级（1-下级分销 2-两下级分销）
+     */
+    private Integer distributeLevel;
+
+    private Long createdAt;
+
+    private Long updatedAt;
+
+    private String proxyId;
+
+    /**
+     * trial试用版，release正式
+     */
+    private String profiles;
+
+    /**
+     * 商家二维码
+     */
+    private String shopQrcode;
+
+    /**
+     * 商家标签
+     */
+    private String tag;
+
+    private String isOpenYhq;
+
+    /**
+     * 0否1是
+     */
+    private Integer isUseVip;
+
+    /**
+     * 省
+     */
+    private String provinces;
+
+    /**
+     * 市
+     */
+    private String cities;
+
+    /**
+     * 区/县
+     */
+    private String districts;
+
+    /**
+     * 是否允许会员自定义金额 1 允许 0 不允许
+     */
+    private String isCustom;
+
+    /**
+     * 是否开启退款密码 1 启用 0 禁用
+     */
+    private String isReturn;
+
+    /**
+     * 是否开启会员充值密码 1 启用 0 禁用
+     */
+    private String isMemberIn;
+
+    /**
+     * 是否开启会员退款密码 1 启用 0 禁用
+     */
+    private String isMemberReturn;
+
+    /**
+     * 是否免除桌位费 0否1是
+     */
+    private Integer isTableFee;
+
+    /**
+     * 是否启用会员价 0否1是
+     */
+    private Integer isMemberPrice;
+
+    /**
+     * 积分群体 all-所有 vip-仅针对会员
+     */
+    private String consumeColony;
+
+    /**
+     * 桌位费
+     */
+    private BigDecimal tableFee;
+
+    /**
+     * 就餐模式  堂食 dine-in  外带 take-out
+     */
+    private String eatModel;
+
+    /**
+     * 小程序码(零点八零首页)
+     */
+    private String smallQrcode;
+
+    /**
+     * 店铺收款码
+     */
+    private String paymentQrcode;
+
+    /**
+     * 台桌预订短信
+     */
+    private String bookingSms;
+
+}

src/main/java/com/czg/mergedata/old/entity/OldSysUser.java

@@ -0,0 +1,121 @@
+package com.czg.mergedata.old.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 系统用户 实体类。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("sys_user")
+public class OldSysUser implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @Id(keyType = KeyType.Auto)
+    private Long userId;
+
+    /**
+     * 部门名称
+     */
+    private Long deptId;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 头像地址
+     */
+    private String avatarName;
+
+    /**
+     * 头像真实路径
+     */
+    private String avatarPath;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 是否为admin账号
+     */
+    private Boolean isAdmin;
+
+    /**
+     * 状态：1启用、0禁用
+     */
+    private Long enabled;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 修改密码的时间
+     */
+    private LocalDateTime pwdResetTime;
+
+    /**
+     * 创建日期
+     */
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/czg/mergedata/old/mapper/OldPlussShopStaffMapper.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.old.entity.OldPlussShopStaff;
+
+/**
+ *  映射层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface OldPlussShopStaffMapper extends BaseMapper<OldPlussShopStaff> {
+
+}

src/main/java/com/czg/mergedata/old/mapper/OldShopInfoMapper.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.old.entity.OldShopInfo;
+
+/**
+ *  映射层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface OldShopInfoMapper extends BaseMapper<OldShopInfo> {
+
+}

src/main/java/com/czg/mergedata/old/mapper/OldSysUserMapper.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.old.entity.OldSysUser;
+
+/**
+ * 系统用户 映射层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface OldSysUserMapper extends BaseMapper<OldSysUser> {
+
+}

src/main/java/com/czg/mergedata/old/service/OldPlussShopStaffService.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.old.entity.OldPlussShopStaff;
+
+/**
+ *  服务层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface OldPlussShopStaffService extends IService<OldPlussShopStaff> {
+
+}

src/main/java/com/czg/mergedata/old/service/OldShopInfoService.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.old.entity.OldShopInfo;
+
+/**
+ *  服务层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface OldShopInfoService extends IService<OldShopInfo> {
+
+}

src/main/java/com/czg/mergedata/old/service/OldSysUserService.java

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.old.entity.OldSysUser;
+
+/**
+ * 系统用户 服务层。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+public interface OldSysUserService extends IService<OldSysUser> {
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldPlussShopStaffImpl.java

@@ -0,0 +1,18 @@
+package com.czg.mergedata.old.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.mergedata.old.entity.OldPlussShopStaff;
+import com.czg.mergedata.old.mapper.OldPlussShopStaffMapper;
+import com.czg.mergedata.old.service.OldPlussShopStaffService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Service
+public class OldPlussShopStaffImpl extends ServiceImpl<OldPlussShopStaffMapper, OldPlussShopStaff>  implements OldPlussShopStaffService{
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldShopInfoImpl.java

@@ -0,0 +1,18 @@
+package com.czg.mergedata.old.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.mergedata.old.entity.OldShopInfo;
+import com.czg.mergedata.old.mapper.OldShopInfoMapper;
+import com.czg.mergedata.old.service.OldShopInfoService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Service
+public class OldShopInfoImpl extends ServiceImpl<OldShopInfoMapper, OldShopInfo>  implements OldShopInfoService{
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldSysUserImpl.java

@@ -0,0 +1,18 @@
+package com.czg.mergedata.old.service.impl;
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.mergedata.old.entity.OldSysUser;
+import com.czg.mergedata.old.mapper.OldSysUserMapper;
+import com.czg.mergedata.old.service.OldSysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 系统用户 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-15
+ */
+@Service
+public class OldSysUserImpl extends ServiceImpl<OldSysUserMapper, OldSysUser>  implements OldSysUserService{
+
+}

src/main/resources/application-dev.yml

@@ -0,0 +1,14 @@
+spring:
+  datasource:
+    cur:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
+      username: cashier
+      password: Cashier@1@
+    old:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/fycashier_test?useUnicode=true&characterEncoding=utf-8
+      username: cashier
+      password: Cashier@1@
+
+

src/main/resources/application-prod.yml

@@ -0,0 +1,36 @@
+
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://rm-bp1kn7h89nz62cno1ro.mysql.rds.aliyuncs.com:3306/czg_cashier?useUnicode=true&characterEncoding=utf-8
+    username: cashier
+    password: Cashier@1@
+
+  data:
+    redis:
+      host: 121.40.109.122
+      port: 6379
+      password: chaozg123
+      timeout: 1000
+      database: 2
+
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 121.40.109.122:8848
+        namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
+
+dubbo:
+  application:
+    name: account-server
+    qos-port: 22221
+    qos-enable: true
+  registry:
+    address: nacos://121.40.109.122:8848 # Nacos 服务地址
+    group: server-test
+    namespace: 237e1905-0a66-4375-9bb6-a51c3c034aca
+  protocol:
+    port: 9101
+    threads: 20
+    threadpool: fixed
+

src/main/resources/application.yml

@@ -0,0 +1,15 @@
+server:
+  port: 8100
+  servlet:
+    context-path: /merge
+
+spring:
+  application:
+    name: merge-data-server
+  profiles:
+    active: dev
+
+logging:
+  config: classpath:logback.xml
+
+

src/main/resources/logback.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+    <contextName>account-server</contextName>
+    <property name="log.charset" value="utf-8" />
+    <property name="log.pattern" value="%yellow(%d{yyyy-MM-dd HH:mm:ss.SSS}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
+    <!--写入文件格式-->
+    <property name="p_file" value="%d | [%thread] %-5level %c [%L] - %msg %n"/>
+    <!--输出到控制台-->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+    </appender>
+    <!--按天生成日志-->
+    <appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/logback.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--生成日志文件名称-->
+            <fileNamePattern>logs/history/%d{yyyy-MM-dd}/logback.%i.log.gz</fileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+            <maxFileSize>20MB</maxFileSize>
+        </rollingPolicy>
+        <!-- 日志输出格式 -->
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${p_file}</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!--普通日志输出到控制台-->
+    <root level="info">
+        <appender-ref ref="console" />
+        <appender-ref ref="logFile"/>
+    </root>
+</configuration>

src/main/resources/mapper/cur/ShopInfoMapper.xml

@@ -0,0 +1,7 @@
+<?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="com.czg.mergedata.cur.mapper.CurShopInfoMapper">
+
+</mapper>

src/main/resources/mapper/cur/ShopStaffMapper.xml

@@ -0,0 +1,7 @@
+<?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="com.czg.mergedata.cur.mapper.CurShopStaffMapper">
+
+</mapper>

src/main/resources/mapper/cur/SysUserMapper.xml

@@ -0,0 +1,7 @@
+<?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="com.czg.mergedata.cur.mapper.CurSysUserMapper">
+
+</mapper>

src/main/resources/mapper/old/PlussShopStaffMapper.xml

@@ -0,0 +1,7 @@
+<?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="com.czg.mergedata.old.mapper.OldPlussShopStaffMapper">
+
+</mapper>

src/main/resources/mapper/old/ShopInfoMapper.xml

@@ -0,0 +1,7 @@
+<?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="com.czg.mergedata.old.mapper.OldShopInfoMapper">
+
+</mapper>

src/main/resources/mapper/old/SysUserMapper.xml

@@ -0,0 +1,7 @@
+<?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="com.czg.mergedata.old.mapper.OldSysUserMapper">
+
+</mapper>

src/test/java/com/czg/mergedata/MergeDataApplicationTests.java

@@ -0,0 +1,13 @@
+package com.czg.mergedata;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class MergeDataApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}