供应商

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

@@ -18,13 +18,13 @@ public class CodeGen {
     private final static String DATABASE = "czg_cashier_test";
     private final static String OLD_DATABASE = "fycashier";
 
-    private final static boolean isOldVersion = false;
+    private final static boolean IS_OLD_VERSION = false;
-//    private final static boolean isOldVersion = true;
+//    private final static boolean IS_OLD_VERSION = true;
 
     public static void main(String[] args) {
         //配置数据源
         HikariDataSource dataSource = new HikariDataSource();
-        dataSource.setJdbcUrl("jdbc:mysql://" + BASE_URL + ":" + PORT + "/" + (isOldVersion ? OLD_DATABASE : DATABASE));
+        dataSource.setJdbcUrl("jdbc:mysql://" + BASE_URL + ":" + PORT + "/" + (IS_OLD_VERSION ? OLD_DATABASE : DATABASE));
         dataSource.setUsername(USERNAME);
         dataSource.setPassword(PASSWORD);
 
@@ -43,12 +43,12 @@ public class CodeGen {
 
         //设置根包
         globalConfig.getPackageConfig()
-                .setBasePackage("com.czg.mergedata" + (isOldVersion ? ".old" : ".cur"));
+                .setBasePackage("com.czg.mergedata" + (IS_OLD_VERSION ? ".old" : ".cur"));
 
         ServiceConfig serviceConfig = globalConfig.getServiceConfig();
         serviceConfig.setSuperClass(IService.class);
         serviceConfig.setClassSuffix("Service");
-        if (isOldVersion) {
+        if (IS_OLD_VERSION) {
             serviceConfig.setClassPrefix("Old");
         } else {
             serviceConfig.setClassPrefix("Cur");
@@ -58,7 +58,7 @@ public class CodeGen {
         ServiceImplConfig implConfig = globalConfig.getServiceImplConfig();
         implConfig.setSuperClass(ServiceImpl.class);
         implConfig.setClassSuffix("ServiceImpl");
-        if (isOldVersion) {
+        if (IS_OLD_VERSION) {
             implConfig.setClassPrefix("Old");
         } else {
             implConfig.setClassPrefix("Cur");
@@ -67,7 +67,7 @@ public class CodeGen {
 
         MapperConfig mapperConfig = globalConfig.getMapperConfig();
         mapperConfig.setClassSuffix("Mapper");
-        if (isOldVersion) {
+        if (IS_OLD_VERSION) {
             mapperConfig.setClassPrefix("Old");
         } else {
             mapperConfig.setClassPrefix("Cur");
@@ -75,16 +75,16 @@ public class CodeGen {
         //设置生成 mapper
         globalConfig.enableMapper();
 
-        globalConfig.setMapperXmlPath((isOldVersion ? "src/main/resources/mapper/old" : "src/main/resources/mapper/cur"));
+        globalConfig.setMapperXmlPath((IS_OLD_VERSION ? "src/main/resources/mapper/old" : "src/main/resources/mapper/cur"));
         globalConfig.enableMapperXml();
 
         //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表
         globalConfig.getStrategyConfig()
                 .setTablePrefix("tb_")
-                .setGenerateTable("tb_shop_ad");
+                .setGenerateTable("tb_shop_vendor_transact_pay", "tb_shop_vendor_transact", "tb_shop_vendor");
 
         EntityConfig entityConfig = globalConfig.getEntityConfig();
-        if (isOldVersion) {
+        if (IS_OLD_VERSION) {
             entityConfig.setClassPrefix("Old");
         } else {
             entityConfig.setClassPrefix("Cur");

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

@@ -3,6 +3,7 @@ package com.czg.mergedata.controller;
 import com.czg.mergedata.common.resp.CzgResult;
 import com.czg.mergedata.cur.service.CurShopAdService;
 import com.czg.mergedata.cur.service.CurShopStorageService;
+import com.czg.mergedata.cur.service.CurShopVendorService;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,6 +21,14 @@ public class ShopInfoController {
     @Resource
     private CurShopAdService curShopAdService;
 
+    @Resource
+    private CurShopVendorService curShopVendorService;
+
+    @RequestMapping("/vendor")
+    public CzgResult<String> mergeShopVendor() {
+        return curShopVendorService.mergeVendor();
+    }
+
     @RequestMapping("/storage")
     public CzgResult<String> mergeShopStorage() {
         return curShopStorageService.mergeData();

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

@@ -0,0 +1,103 @@
+package com.czg.mergedata.cur.entity;
+
+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-03-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_vendor")
+public class CurShopVendor implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 店铺Id
+     */
+    private Long shopId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 供应商名称
+     */
+    private String name;
+
+    /**
+     * 联系人名称
+     */
+    private String contactName;
+
+    /**
+     * 联系人电话
+     */
+    private String telephone;
+
+    /**
+     * 供应商地址
+     */
+    private String address;
+
+    /**
+     * 结算周期（日）
+     */
+    private Integer period;
+
+    /**
+     * 标签
+     */
+    private String tip;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 最后一次交易时间(主要做排序)
+     */
+    private LocalDateTime lastTransactTime;
+
+    /**
+     * 逻辑删除 1-是 0-否
+     */
+    private Integer isDel;
+
+}

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

@@ -0,0 +1,94 @@
+package com.czg.mergedata.cur.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.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 供应商-帐目往来 实体类。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_vendor_transact")
+public class CurShopVendorTransact implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 店铺Id
+     */
+    private String shopId;
+
+    /**
+     * 供应商名字
+     */
+    private String purveyorName;
+
+    /**
+     * 供应商Id
+     */
+    private String purveyorId;
+
+    /**
+     * 0待付款1已付款 -1是否作废
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+    /**
+     * 应付金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 待付款金额
+     */
+    private BigDecimal waitAmount;
+
+    /**
+     * 已支付金额
+     */
+    private BigDecimal paidAmount;
+
+    private Long paidAt;
+
+    private String type;
+
+    /**
+     * 付款方式
+     */
+    private String payType;
+
+    private String conInfos;
+
+}

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

@@ -0,0 +1,64 @@
+package com.czg.mergedata.cur.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.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 供应商-店铺账目往来-进出帐 实体类。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_vendor_transact_pay")
+public class CurShopVendorTransactPay implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 进出帐id
+     */
+    private Integer transactId;
+
+    /**
+     * 付款方式
+     */
+    private String payType;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal paidAmount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+}

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

@@ -0,0 +1,17 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurShopVendor;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 供应商 映射层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+public interface CurShopVendorMapper extends BaseMapper<CurShopVendor> {
+
+    @Select("truncate tb_shop_vendor ")
+    void truncateTable();
+}

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

@@ -0,0 +1,17 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurShopVendorTransact;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 供应商-帐目往来 映射层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+public interface CurShopVendorTransactMapper extends BaseMapper<CurShopVendorTransact> {
+
+    @Select("truncate tb_shop_vendor_transact ")
+    void truncateTable();
+}

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

@@ -0,0 +1,17 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurShopVendorTransactPay;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 供应商-店铺账目往来-进出帐 映射层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+public interface CurShopVendorTransactPayMapper extends BaseMapper<CurShopVendorTransactPay> {
+
+    @Select("truncate tb_shop_vendor_transact_pay ")
+    void truncateTable();
+}

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

@@ -0,0 +1,17 @@
+package com.czg.mergedata.cur.service;
+
+import com.czg.mergedata.common.resp.CzgResult;
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurShopVendor;
+
+/**
+ * 供应商 服务层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+public interface CurShopVendorService extends IService<CurShopVendor> {
+
+    CzgResult<String> mergeVendor();
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurShopVendorTransactPay;
+
+/**
+ * 供应商-店铺账目往来-进出帐 服务层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+public interface CurShopVendorTransactPayService extends IService<CurShopVendorTransactPay> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurShopVendorTransact;
+
+/**
+ * 供应商-帐目往来 服务层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+public interface CurShopVendorTransactService extends IService<CurShopVendorTransact> {
+
+}

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

@@ -0,0 +1,123 @@
+package com.czg.mergedata.cur.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
+import com.czg.mergedata.common.resp.CzgResult;
+import com.czg.mergedata.cur.entity.CurShopVendorTransact;
+import com.czg.mergedata.cur.entity.CurShopVendorTransactPay;
+import com.czg.mergedata.cur.mapper.CurShopVendorTransactMapper;
+import com.czg.mergedata.cur.mapper.CurShopVendorTransactPayMapper;
+import com.czg.mergedata.old.entity.OldShopPurveyor;
+import com.czg.mergedata.old.entity.OldShopPurveyorTransact;
+import com.czg.mergedata.old.entity.OldShopPurveyorTransactPay;
+import com.czg.mergedata.old.service.OldShopPurveyorService;
+import com.czg.mergedata.old.service.OldShopPurveyorTransactPayService;
+import com.czg.mergedata.old.service.OldShopPurveyorTransactService;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.mergedata.cur.entity.CurShopVendor;
+import com.czg.mergedata.cur.mapper.CurShopVendorMapper;
+import com.czg.mergedata.cur.service.CurShopVendorService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 供应商 服务层实现。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Service
+public class CurShopVendorServiceImpl extends ServiceImpl<CurShopVendorMapper, CurShopVendor> implements CurShopVendorService {
+
+    @Resource
+    private CurShopVendorTransactMapper curShopVendorTransactMapper;
+
+    @Resource
+    private CurShopVendorTransactPayMapper curShopVendorTransactPayMapper;
+
+    @Resource
+    private OldShopPurveyorService oldShopPurveyorService;
+
+    @Resource
+    private OldShopPurveyorTransactService oldShopPurveyorTransactService;
+
+    @Resource
+    private OldShopPurveyorTransactPayService oldShopPurveyorTransactPayService;
+
+    @Override
+    @Transactional
+    public CzgResult<String> mergeVendor() {
+        getMapper().truncateTable();
+        curShopVendorTransactMapper.truncateTable();
+        curShopVendorTransactPayMapper.truncateTable();
+
+        execVendor();
+        execVendorTransact();
+        execVendorTransactPay();
+
+        return CzgResult.success("合并成功");
+    }
+
+    private void execVendor() {
+        List<OldShopPurveyor> list = oldShopPurveyorService.list();
+
+        List<CurShopVendor> curShopVendors = new ArrayList<>();
+
+        for (OldShopPurveyor oldShopPurveyor : list) {
+            CurShopVendor curShopVendor = new CurShopVendor();
+            curShopVendor.setId(Long.valueOf(oldShopPurveyor.getId()));
+            curShopVendor.setShopId(Long.valueOf(oldShopPurveyor.getShopId()));
+            curShopVendor.setSort(oldShopPurveyor.getSort());
+            curShopVendor.setName(oldShopPurveyor.getName());
+            curShopVendor.setContactName(oldShopPurveyor.getPurveyorName());
+            curShopVendor.setTelephone(oldShopPurveyor.getPurveyorTelephone());
+            curShopVendor.setAddress(oldShopPurveyor.getAddress());
+            curShopVendor.setPeriod(oldShopPurveyor.getPeriod());
+            curShopVendor.setTip(oldShopPurveyor.getTip());
+            curShopVendor.setRemark(oldShopPurveyor.getRemark());
+            curShopVendor.setCreateTime(DateUtil.toLocalDateTime(oldShopPurveyor.getCreatedAt() == null ? new Date() : new Date(oldShopPurveyor.getCreatedAt())));
+            curShopVendor.setUpdateTime(DateUtil.toLocalDateTime(oldShopPurveyor.getUpdatedAt() == null ? new Date() : new Date(oldShopPurveyor.getUpdatedAt())));
+            curShopVendor.setLastTransactTime(oldShopPurveyor.getLastTransactAt() == null ?  null :DateUtil.toLocalDateTime(new Date(oldShopPurveyor.getLastTransactAt())));
+            curShopVendor.setIsDel(0);
+
+            curShopVendors.add(curShopVendor);
+        }
+
+        saveBatch(curShopVendors);
+    }
+
+    private void execVendorTransact() {
+        List<OldShopPurveyorTransact> list = oldShopPurveyorTransactService.list();
+        List<CurShopVendorTransact> curShopVendorTransacts = new ArrayList<>();
+
+        for (OldShopPurveyorTransact oldShopPurveyorTransact : list) {
+            CurShopVendorTransact curShopVendorTransact = BeanUtil.toBean(oldShopPurveyorTransact, CurShopVendorTransact.class);
+
+            curShopVendorTransact.setCreateTime(DateUtil.toLocalDateTime(oldShopPurveyorTransact.getCreatedAt() == null ? new Date() : new Date(oldShopPurveyorTransact.getCreatedAt())));
+            curShopVendorTransact.setUpdateTime(DateUtil.toLocalDateTime(oldShopPurveyorTransact.getUpdatedAt() == null ? new Date() : new Date(oldShopPurveyorTransact.getUpdatedAt())));
+
+            curShopVendorTransacts.add(curShopVendorTransact);
+        }
+
+        curShopVendorTransactMapper.insertBatch(curShopVendorTransacts);
+    }
+
+    private void execVendorTransactPay() {
+        List<OldShopPurveyorTransactPay> list = oldShopPurveyorTransactPayService.list();
+
+        List<CurShopVendorTransactPay> curShopVendorTransactPays = new ArrayList<>();
+
+        for (OldShopPurveyorTransactPay oldShopPurveyorTransactPay : list) {
+            CurShopVendorTransactPay curShopVendorTransactPay = BeanUtil.toBean(oldShopPurveyorTransactPay, CurShopVendorTransactPay.class);
+
+            curShopVendorTransactPays.add(curShopVendorTransactPay);
+        }
+
+        curShopVendorTransactPayMapper.insertBatch(curShopVendorTransactPays);
+    }
+}

src/main/java/com/czg/mergedata/cur/service/impl/CurShopVendorTransactPayServiceImpl.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.CurShopVendorTransactPay;
+import com.czg.mergedata.cur.mapper.CurShopVendorTransactPayMapper;
+import com.czg.mergedata.cur.service.CurShopVendorTransactPayService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商-店铺账目往来-进出帐 服务层实现。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Service
+public class CurShopVendorTransactPayServiceImpl extends ServiceImpl<CurShopVendorTransactPayMapper, CurShopVendorTransactPay>  implements CurShopVendorTransactPayService{
+
+}

src/main/java/com/czg/mergedata/cur/service/impl/CurShopVendorTransactServiceImpl.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.CurShopVendorTransact;
+import com.czg.mergedata.cur.mapper.CurShopVendorTransactMapper;
+import com.czg.mergedata.cur.service.CurShopVendorTransactService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商-帐目往来 服务层实现。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Service
+public class CurShopVendorTransactServiceImpl extends ServiceImpl<CurShopVendorTransactMapper, CurShopVendorTransact>  implements CurShopVendorTransactService{
+
+}

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

@@ -0,0 +1,91 @@
+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.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 供应商 实体类。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_purveyor")
+public class OldShopPurveyor implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 店铺Id
+     */
+    private String shopId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 联系人名字
+     */
+    private String purveyorName;
+
+    /**
+     * 联系人电话
+     */
+    private String purveyorTelephone;
+
+    /**
+     * 结算周期（日）
+     */
+    private Integer period;
+
+    /**
+     * 供应商地址
+     */
+    private String address;
+
+    /**
+     * 标签
+     */
+    private String tip;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private Long createdAt;
+
+    private Long updatedAt;
+
+    /**
+     * 最后一次交易时间(主要做排序)
+     */
+    private Long lastTransactAt;
+
+}

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

@@ -0,0 +1,93 @@
+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-03-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_purveyor_transact")
+public class OldShopPurveyorTransact implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 店铺Id
+     */
+    private String shopId;
+
+    /**
+     * 供应商名字
+     */
+    private String purveyorName;
+
+    /**
+     * 供应商Id
+     */
+    private String purveyorId;
+
+    /**
+     * 0待付款1已付款 -1是否作废
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    private Long createdAt;
+
+    private Long updatedAt;
+
+    /**
+     * 应付金额
+     */
+    private BigDecimal totalAmount;
+
+    /**
+     * 待付款金额
+     */
+    private BigDecimal waitAmount;
+
+    /**
+     * 已支付金额
+     */
+    private BigDecimal paidAmount;
+
+    private Long paidAt;
+
+    private String type;
+
+    /**
+     * 付款方式
+     */
+    private String payType;
+
+    private String conInfos;
+
+}

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

@@ -0,0 +1,64 @@
+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.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_purveyor_transact_pay")
+public class OldShopPurveyorTransactPay implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 自增id
+     */
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 进出帐id
+     */
+    private Integer transactId;
+
+    /**
+     * 付款方式
+     */
+    private String payType;
+
+    /**
+     * 付款金额
+     */
+    private BigDecimal paidAmount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+}

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

@@ -0,0 +1,16 @@
+package com.czg.mergedata.old.mapper;
+
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.old.entity.OldShopPurveyor;
+
+/**
+ * 供应商 映射层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@UseDataSource("ds2")
+public interface OldShopPurveyorMapper extends BaseMapper<OldShopPurveyor> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.czg.mergedata.old.mapper;
+
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.old.entity.OldShopPurveyorTransact;
+
+/**
+ * 帐目往来 映射层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@UseDataSource("ds2")
+public interface OldShopPurveyorTransactMapper extends BaseMapper<OldShopPurveyorTransact> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.czg.mergedata.old.mapper;
+
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.old.entity.OldShopPurveyorTransactPay;
+
+/**
+ *  映射层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@UseDataSource("ds2")
+public interface OldShopPurveyorTransactPayMapper extends BaseMapper<OldShopPurveyorTransactPay> {
+
+}

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

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

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

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

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

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.old.entity.OldShopPurveyorTransact;
+
+/**
+ * 帐目往来 服务层。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+public interface OldShopPurveyorTransactService extends IService<OldShopPurveyorTransact> {
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldShopPurveyorServiceImpl.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.OldShopPurveyor;
+import com.czg.mergedata.old.mapper.OldShopPurveyorMapper;
+import com.czg.mergedata.old.service.OldShopPurveyorService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 供应商 服务层实现。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Service
+public class OldShopPurveyorServiceImpl extends ServiceImpl<OldShopPurveyorMapper, OldShopPurveyor>  implements OldShopPurveyorService{
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldShopPurveyorTransactPayServiceImpl.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.OldShopPurveyorTransactPay;
+import com.czg.mergedata.old.mapper.OldShopPurveyorTransactPayMapper;
+import com.czg.mergedata.old.service.OldShopPurveyorTransactPayService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Service
+public class OldShopPurveyorTransactPayServiceImpl extends ServiceImpl<OldShopPurveyorTransactPayMapper, OldShopPurveyorTransactPay>  implements OldShopPurveyorTransactPayService{
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldShopPurveyorTransactServiceImpl.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.OldShopPurveyorTransact;
+import com.czg.mergedata.old.mapper.OldShopPurveyorTransactMapper;
+import com.czg.mergedata.old.service.OldShopPurveyorTransactService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 帐目往来 服务层实现。
+ *
+ * @author mac
+ * @since 2025-03-15
+ */
+@Service
+public class OldShopPurveyorTransactServiceImpl extends ServiceImpl<OldShopPurveyorTransactMapper, OldShopPurveyorTransact>  implements OldShopPurveyorTransactService{
+
+}

src/main/resources/mapper/cur/ShopVendorMapper.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.CurShopVendorMapper">
+
+</mapper>

src/main/resources/mapper/cur/ShopVendorTransactMapper.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.CurShopVendorTransactMapper">
+
+</mapper>

src/main/resources/mapper/cur/ShopVendorTransactPayMapper.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.CurShopVendorTransactPayMapper">
+
+</mapper>

src/main/resources/mapper/old/ShopPurveyorMapper.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.OldShopPurveyorMapper">
+
+</mapper>

src/main/resources/mapper/old/ShopPurveyorTransactMapper.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.OldShopPurveyorTransactMapper">
+
+</mapper>

src/main/resources/mapper/old/ShopPurveyorTransactPayMapper.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.OldShopPurveyorTransactPayMapper">
+
+</mapper>

收银机数据迁移关系.md

@@ -151,3 +151,11 @@
 - tb_shop_ad   表
 
 
+### 22. 供应商
+> /merge/shopInfo/vendor
+#### 执行表
+- tb_shop_vendor   表
+- tb_shop_vendor_transact   表
+- tb_shop_vendor_transact_pay   表
+
+