diff --git a/src/main/java/com/czg/mergedata/common/utils/CodeGen.java b/src/main/java/com/czg/mergedata/common/utils/CodeGen.java index aa8e7b2..8d9b12a 100644 --- a/src/main/java/com/czg/mergedata/common/utils/CodeGen.java +++ b/src/main/java/com/czg/mergedata/common/utils/CodeGen.java @@ -18,8 +18,8 @@ public class CodeGen { private final static String DATABASE = "czg_cashier_test"; private final static String OLD_DATABASE = "fycashier"; -// private final static boolean IS_OLD_VERSION = false; - private final static boolean IS_OLD_VERSION = true; + private final static boolean IS_OLD_VERSION = false; +// private final static boolean IS_OLD_VERSION = true; public static void main(String[] args) { //配置数据源 @@ -81,7 +81,7 @@ public class CodeGen { //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表 globalConfig.getStrategyConfig() .setTablePrefix("tb_") - .setGenerateTable("tb_shop_extend"); + .setGenerateTable("tb_credit_buyer", "tb_credit_buyer_order", "tb_credit_payment_record"); EntityConfig entityConfig = globalConfig.getEntityConfig(); if (IS_OLD_VERSION) { diff --git a/src/main/java/com/czg/mergedata/controller/ShopInfoController.java b/src/main/java/com/czg/mergedata/controller/ShopInfoController.java index 0952369..c3e5e99 100644 --- a/src/main/java/com/czg/mergedata/controller/ShopInfoController.java +++ b/src/main/java/com/czg/mergedata/controller/ShopInfoController.java @@ -1,10 +1,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.CurShopExtendService; -import com.czg.mergedata.cur.service.CurShopStorageService; -import com.czg.mergedata.cur.service.CurShopVendorService; +import com.czg.mergedata.cur.service.*; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -28,6 +25,14 @@ public class ShopInfoController { @Resource private CurShopExtendService curShopExtendService; + @Resource + private CurCreditBuyerService curCreditBuyerService; + + @RequestMapping("/credit") + public CzgResult mergeCreditBuyer() { + return curCreditBuyerService.mergeCredit(); + } + @RequestMapping("/extend") public CzgResult mergeShopExtend() { return curShopExtendService.mergeShopExtend(); diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurCreditBuyer.java b/src/main/java/com/czg/mergedata/cur/entity/CurCreditBuyer.java new file mode 100644 index 0000000..aa3ce5f --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurCreditBuyer.java @@ -0,0 +1,97 @@ +package com.czg.mergedata.cur.entity; + +import com.mybatisflex.annotation.Id; +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_credit_buyer") +public class CurCreditBuyer implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 挂账编码 + */ + @Id + private String id; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 状态 1-启用 0-停用 + */ + private Boolean status; + + /** + * 挂账人 + */ + private String debtor; + + /** + * 手机号 + */ + private String mobile; + + /** + * 职务 + */ + private String position; + + /** + * 挂账额度 + */ + private BigDecimal creditAmount; + + /** + * 账户余额 + */ + private BigDecimal accountBalance; + + /** + * 还款方式 total-按总金额还款 order-按订单还款 + */ + private String repaymentMethod; + + /** + * 支付方式 + */ + private String paymentMethod; + + /** + * 责任人 + */ + private String responsiblePerson; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志 0-正常 1-删除 + */ + private Boolean isDel; + +} diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurCreditBuyerOrder.java b/src/main/java/com/czg/mergedata/cur/entity/CurCreditBuyerOrder.java new file mode 100644 index 0000000..1039f1d --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurCreditBuyerOrder.java @@ -0,0 +1,74 @@ +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_credit_buyer_order") +public class CurCreditBuyerOrder implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 订单id + */ + private Long orderId; + + /** + * 挂账人编码 + */ + private String creditBuyerId; + + /** + * 已付金额 + */ + private BigDecimal paidAmount; + + /** + * 状态 unpaid-未付款 partial-部分支付 paid-已付款 + */ + private String status; + + /** + * 最近一次付款时间 + */ + private LocalDateTime lastPaymentTime; + + /** + * 最近一次付款方式 + */ + private String lastPaymentMethod; + + /** + * 备注 + */ + private String remark; + +} diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurCreditPaymentRecord.java b/src/main/java/com/czg/mergedata/cur/entity/CurCreditPaymentRecord.java new file mode 100644 index 0000000..0501af2 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurCreditPaymentRecord.java @@ -0,0 +1,74 @@ +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_credit_payment_record") +public class CurCreditPaymentRecord implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 订单id + */ + private Long orderId; + + /** + * 挂账人编码 + */ + private String creditBuyerId; + + /** + * 还款金额 + */ + private BigDecimal repaymentAmount; + + /** + * 支付方式 + */ + private String paymentMethod; + + /** + * 备注 + */ + private String remark; + + /** + * 还款时间 + */ + private LocalDateTime paymentTime; + + /** + * 操作时间 + */ + private LocalDateTime createTime; + +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurCreditBuyerMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurCreditBuyerMapper.java new file mode 100644 index 0000000..7b431f9 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurCreditBuyerMapper.java @@ -0,0 +1,17 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurCreditBuyer; +import org.apache.ibatis.annotations.Select; + +/** + * 挂账人 映射层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface CurCreditBuyerMapper extends BaseMapper { + + @Select("truncate tb_credit_buyer") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurCreditBuyerOrderMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurCreditBuyerOrderMapper.java new file mode 100644 index 0000000..715523d --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurCreditBuyerOrderMapper.java @@ -0,0 +1,17 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurCreditBuyerOrder; +import org.apache.ibatis.annotations.Select; + +/** + * 挂账账单 映射层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface CurCreditBuyerOrderMapper extends BaseMapper { + + @Select("truncate tb_credit_buyer_order") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurCreditPaymentRecordMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurCreditPaymentRecordMapper.java new file mode 100644 index 0000000..ee816f9 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurCreditPaymentRecordMapper.java @@ -0,0 +1,17 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurCreditPaymentRecord; +import org.apache.ibatis.annotations.Select; + +/** + * 挂账账单付款记录 映射层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface CurCreditPaymentRecordMapper extends BaseMapper { + + @Select("truncate tb_credit_payment_record") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurCreditBuyerOrderService.java b/src/main/java/com/czg/mergedata/cur/service/CurCreditBuyerOrderService.java new file mode 100644 index 0000000..00ef75a --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurCreditBuyerOrderService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.cur.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.cur.entity.CurCreditBuyerOrder; + +/** + * 挂账账单 服务层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface CurCreditBuyerOrderService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurCreditBuyerService.java b/src/main/java/com/czg/mergedata/cur/service/CurCreditBuyerService.java new file mode 100644 index 0000000..f966daf --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurCreditBuyerService.java @@ -0,0 +1,16 @@ +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.CurCreditBuyer; + +/** + * 挂账人 服务层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface CurCreditBuyerService extends IService { + + CzgResult mergeCredit(); +} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurCreditPaymentRecordService.java b/src/main/java/com/czg/mergedata/cur/service/CurCreditPaymentRecordService.java new file mode 100644 index 0000000..42f848b --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurCreditPaymentRecordService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.cur.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.cur.entity.CurCreditPaymentRecord; + +/** + * 挂账账单付款记录 服务层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface CurCreditPaymentRecordService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditBuyerOrderServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditBuyerOrderServiceImpl.java new file mode 100644 index 0000000..8f94b56 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditBuyerOrderServiceImpl.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.CurCreditBuyerOrder; +import com.czg.mergedata.cur.mapper.CurCreditBuyerOrderMapper; +import com.czg.mergedata.cur.service.CurCreditBuyerOrderService; +import org.springframework.stereotype.Service; + +/** + * 挂账账单 服务层实现。 + * + * @author mac + * @since 2025-03-15 + */ +@Service +public class CurCreditBuyerOrderServiceImpl extends ServiceImpl implements CurCreditBuyerOrderService{ + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditBuyerServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditBuyerServiceImpl.java new file mode 100644 index 0000000..28e3e86 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditBuyerServiceImpl.java @@ -0,0 +1,95 @@ +package com.czg.mergedata.cur.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.czg.mergedata.common.resp.CzgResult; +import com.czg.mergedata.cur.entity.CurCreditBuyerOrder; +import com.czg.mergedata.cur.entity.CurCreditPaymentRecord; +import com.czg.mergedata.cur.mapper.CurCreditBuyerOrderMapper; +import com.czg.mergedata.cur.mapper.CurCreditPaymentRecordMapper; +import com.czg.mergedata.old.entity.OldCreditBuyer; +import com.czg.mergedata.old.entity.OldCreditBuyerOrder; +import com.czg.mergedata.old.entity.OldCreditPaymentRecord; +import com.czg.mergedata.old.service.OldCreditBuyerOrderService; +import com.czg.mergedata.old.service.OldCreditBuyerService; +import com.czg.mergedata.old.service.OldCreditPaymentRecordService; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import com.czg.mergedata.cur.entity.CurCreditBuyer; +import com.czg.mergedata.cur.mapper.CurCreditBuyerMapper; +import com.czg.mergedata.cur.service.CurCreditBuyerService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 挂账人 服务层实现。 + * + * @author mac + * @since 2025-03-15 + */ +@Service +public class CurCreditBuyerServiceImpl extends ServiceImpl implements CurCreditBuyerService { + @Resource + private CurCreditBuyerOrderMapper curCreditBuyerOrderMapper; + + @Resource + private CurCreditPaymentRecordMapper curCreditPaymentRecordMapper; + + @Resource + private OldCreditBuyerService oldCreditBuyerService; + + @Resource + private OldCreditBuyerOrderService oldCreditBuyerOrderService; + + @Resource + private OldCreditPaymentRecordService oldCreditPaymentRecordService; + + @Override + @Transactional + public CzgResult mergeCredit() { + getMapper().truncateTable(); + curCreditBuyerOrderMapper.truncateTable(); + curCreditPaymentRecordMapper.truncateTable(); + + execCredit(); + execBuyerOrder(); + execPaymentRecord(); + + return CzgResult.success("合并成功"); + } + + private void execCredit() { + List list = oldCreditBuyerService.list(); + + List curList = new ArrayList<>(); + for (OldCreditBuyer oldCreditBuyer : list) { + CurCreditBuyer bean = BeanUtil.toBean(oldCreditBuyer, CurCreditBuyer.class); + curList.add(bean); + } + saveBatch(curList); + } + + private void execBuyerOrder() { + List list = oldCreditBuyerOrderService.list(); + + List curList = new ArrayList<>(); + for (OldCreditBuyerOrder oldCreditBuyerOrder : list) { + CurCreditBuyerOrder bean = BeanUtil.toBean(oldCreditBuyerOrder, CurCreditBuyerOrder.class); + curList.add(bean); + } + curCreditBuyerOrderMapper.insertBatch(curList); + } + + private void execPaymentRecord() { + List list = oldCreditPaymentRecordService.list(); + + List curList = new ArrayList<>(); + for (OldCreditPaymentRecord oldCreditPaymentRecord : list) { + CurCreditPaymentRecord bean = BeanUtil.toBean(oldCreditPaymentRecord, CurCreditPaymentRecord.class); + curList.add(bean); + } + curCreditPaymentRecordMapper.insertBatch(curList); + } +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditPaymentRecordServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditPaymentRecordServiceImpl.java new file mode 100644 index 0000000..652227f --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurCreditPaymentRecordServiceImpl.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.CurCreditPaymentRecord; +import com.czg.mergedata.cur.mapper.CurCreditPaymentRecordMapper; +import com.czg.mergedata.cur.service.CurCreditPaymentRecordService; +import org.springframework.stereotype.Service; + +/** + * 挂账账单付款记录 服务层实现。 + * + * @author mac + * @since 2025-03-15 + */ +@Service +public class CurCreditPaymentRecordServiceImpl extends ServiceImpl implements CurCreditPaymentRecordService{ + +} diff --git a/src/main/java/com/czg/mergedata/old/entity/OldCreditBuyer.java b/src/main/java/com/czg/mergedata/old/entity/OldCreditBuyer.java new file mode 100644 index 0000000..413eb8d --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/entity/OldCreditBuyer.java @@ -0,0 +1,97 @@ +package com.czg.mergedata.old.entity; + +import com.mybatisflex.annotation.Id; +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_credit_buyer") +public class OldCreditBuyer implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 挂账编码 + */ + @Id + private String id; + + /** + * 店铺id + */ + private Integer shopId; + + /** + * 状态 1-启用 0-停用 + */ + private Boolean status; + + /** + * 挂账人 + */ + private String debtor; + + /** + * 手机号 + */ + private String mobile; + + /** + * 职务 + */ + private String position; + + /** + * 挂账额度 + */ + private BigDecimal creditAmount; + + /** + * 账户余额 + */ + private BigDecimal accountBalance; + + /** + * 还款方式 total-按总金额还款 order-按订单还款 + */ + private String repaymentMethod; + + /** + * 支付方式 + */ + private String paymentMethod; + + /** + * 责任人 + */ + private String responsiblePerson; + + /** + * 备注 + */ + private String remark; + + /** + * 删除标志 0-正常 1-删除 + */ + private Boolean delFlag; + +} diff --git a/src/main/java/com/czg/mergedata/old/entity/OldCreditBuyerOrder.java b/src/main/java/com/czg/mergedata/old/entity/OldCreditBuyerOrder.java new file mode 100644 index 0000000..caeac1d --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/entity/OldCreditBuyerOrder.java @@ -0,0 +1,74 @@ +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_credit_buyer_order") +public class OldCreditBuyerOrder implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 订单id + */ + private Long orderId; + + /** + * 挂账人编码 + */ + private String creditBuyerId; + + /** + * 已付金额 + */ + private BigDecimal paidAmount; + + /** + * 状态 unpaid-未付款 partial-部分支付 paid-已付款 + */ + private String status; + + /** + * 最近一次付款时间 + */ + private LocalDateTime lastPaymentTime; + + /** + * 最近一次付款方式 + */ + private String lastPaymentMethod; + + /** + * 备注 + */ + private String remark; + +} diff --git a/src/main/java/com/czg/mergedata/old/entity/OldCreditPaymentRecord.java b/src/main/java/com/czg/mergedata/old/entity/OldCreditPaymentRecord.java new file mode 100644 index 0000000..14990ac --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/entity/OldCreditPaymentRecord.java @@ -0,0 +1,74 @@ +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_credit_payment_record") +public class OldCreditPaymentRecord implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * id + */ + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 订单id + */ + private Long orderId; + + /** + * 挂账人编码 + */ + private String creditBuyerId; + + /** + * 还款金额 + */ + private BigDecimal repaymentAmount; + + /** + * 支付方式 + */ + private String paymentMethod; + + /** + * 备注 + */ + private String remark; + + /** + * 还款时间 + */ + private LocalDateTime paymentTime; + + /** + * 操作时间 + */ + private LocalDateTime createTime; + +} diff --git a/src/main/java/com/czg/mergedata/old/mapper/OldCreditBuyerMapper.java b/src/main/java/com/czg/mergedata/old/mapper/OldCreditBuyerMapper.java new file mode 100644 index 0000000..b7c6e24 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/mapper/OldCreditBuyerMapper.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.OldCreditBuyer; + +/** + * 挂账人 映射层。 + * + * @author mac + * @since 2025-03-15 + */ +@UseDataSource("ds2") +public interface OldCreditBuyerMapper extends BaseMapper { + +} diff --git a/src/main/java/com/czg/mergedata/old/mapper/OldCreditBuyerOrderMapper.java b/src/main/java/com/czg/mergedata/old/mapper/OldCreditBuyerOrderMapper.java new file mode 100644 index 0000000..2a08385 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/mapper/OldCreditBuyerOrderMapper.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.OldCreditBuyerOrder; + +/** + * 挂账账单 映射层。 + * + * @author mac + * @since 2025-03-15 + */ +@UseDataSource("ds2") +public interface OldCreditBuyerOrderMapper extends BaseMapper { + +} diff --git a/src/main/java/com/czg/mergedata/old/mapper/OldCreditPaymentRecordMapper.java b/src/main/java/com/czg/mergedata/old/mapper/OldCreditPaymentRecordMapper.java new file mode 100644 index 0000000..d9e9b77 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/mapper/OldCreditPaymentRecordMapper.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.OldCreditPaymentRecord; + +/** + * 挂账账单付款记录 映射层。 + * + * @author mac + * @since 2025-03-15 + */ +@UseDataSource("ds2") +public interface OldCreditPaymentRecordMapper extends BaseMapper { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/OldCreditBuyerOrderService.java b/src/main/java/com/czg/mergedata/old/service/OldCreditBuyerOrderService.java new file mode 100644 index 0000000..04873eb --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/OldCreditBuyerOrderService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.old.entity.OldCreditBuyerOrder; + +/** + * 挂账账单 服务层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface OldCreditBuyerOrderService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/OldCreditBuyerService.java b/src/main/java/com/czg/mergedata/old/service/OldCreditBuyerService.java new file mode 100644 index 0000000..e8961bb --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/OldCreditBuyerService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.old.entity.OldCreditBuyer; + +/** + * 挂账人 服务层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface OldCreditBuyerService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/OldCreditPaymentRecordService.java b/src/main/java/com/czg/mergedata/old/service/OldCreditPaymentRecordService.java new file mode 100644 index 0000000..c04d77f --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/OldCreditPaymentRecordService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.old.entity.OldCreditPaymentRecord; + +/** + * 挂账账单付款记录 服务层。 + * + * @author mac + * @since 2025-03-15 + */ +public interface OldCreditPaymentRecordService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/impl/OldCreditBuyerOrderServiceImpl.java b/src/main/java/com/czg/mergedata/old/service/impl/OldCreditBuyerOrderServiceImpl.java new file mode 100644 index 0000000..0532e6d --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/impl/OldCreditBuyerOrderServiceImpl.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.OldCreditBuyerOrder; +import com.czg.mergedata.old.mapper.OldCreditBuyerOrderMapper; +import com.czg.mergedata.old.service.OldCreditBuyerOrderService; +import org.springframework.stereotype.Service; + +/** + * 挂账账单 服务层实现。 + * + * @author mac + * @since 2025-03-15 + */ +@Service +public class OldCreditBuyerOrderServiceImpl extends ServiceImpl implements OldCreditBuyerOrderService{ + +} diff --git a/src/main/java/com/czg/mergedata/old/service/impl/OldCreditBuyerServiceImpl.java b/src/main/java/com/czg/mergedata/old/service/impl/OldCreditBuyerServiceImpl.java new file mode 100644 index 0000000..a3fb55a --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/impl/OldCreditBuyerServiceImpl.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.OldCreditBuyer; +import com.czg.mergedata.old.mapper.OldCreditBuyerMapper; +import com.czg.mergedata.old.service.OldCreditBuyerService; +import org.springframework.stereotype.Service; + +/** + * 挂账人 服务层实现。 + * + * @author mac + * @since 2025-03-15 + */ +@Service +public class OldCreditBuyerServiceImpl extends ServiceImpl implements OldCreditBuyerService{ + +} diff --git a/src/main/java/com/czg/mergedata/old/service/impl/OldCreditPaymentRecordServiceImpl.java b/src/main/java/com/czg/mergedata/old/service/impl/OldCreditPaymentRecordServiceImpl.java new file mode 100644 index 0000000..6251bf3 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/impl/OldCreditPaymentRecordServiceImpl.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.OldCreditPaymentRecord; +import com.czg.mergedata.old.mapper.OldCreditPaymentRecordMapper; +import com.czg.mergedata.old.service.OldCreditPaymentRecordService; +import org.springframework.stereotype.Service; + +/** + * 挂账账单付款记录 服务层实现。 + * + * @author mac + * @since 2025-03-15 + */ +@Service +public class OldCreditPaymentRecordServiceImpl extends ServiceImpl implements OldCreditPaymentRecordService{ + +} diff --git a/src/main/resources/mapper/cur/CreditBuyerMapper.xml b/src/main/resources/mapper/cur/CreditBuyerMapper.xml new file mode 100644 index 0000000..81897c2 --- /dev/null +++ b/src/main/resources/mapper/cur/CreditBuyerMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/cur/CreditBuyerOrderMapper.xml b/src/main/resources/mapper/cur/CreditBuyerOrderMapper.xml new file mode 100644 index 0000000..4629c81 --- /dev/null +++ b/src/main/resources/mapper/cur/CreditBuyerOrderMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/cur/CreditPaymentRecordMapper.xml b/src/main/resources/mapper/cur/CreditPaymentRecordMapper.xml new file mode 100644 index 0000000..eb2d436 --- /dev/null +++ b/src/main/resources/mapper/cur/CreditPaymentRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/old/CreditBuyerMapper.xml b/src/main/resources/mapper/old/CreditBuyerMapper.xml new file mode 100644 index 0000000..12a6488 --- /dev/null +++ b/src/main/resources/mapper/old/CreditBuyerMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/old/CreditBuyerOrderMapper.xml b/src/main/resources/mapper/old/CreditBuyerOrderMapper.xml new file mode 100644 index 0000000..924a90d --- /dev/null +++ b/src/main/resources/mapper/old/CreditBuyerOrderMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/old/CreditPaymentRecordMapper.xml b/src/main/resources/mapper/old/CreditPaymentRecordMapper.xml new file mode 100644 index 0000000..92cbc1d --- /dev/null +++ b/src/main/resources/mapper/old/CreditPaymentRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index db91ffb..9063446 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -163,3 +163,10 @@ #### 执行表 - tb_shop_extend 表 +### 24. 挂账 +> /merge/shopInfo/credit +#### 执行表 +- tb_credit_buyer 表 +- tb_credit_buyer_order 表 +- tb_credit_payment_record 表 +