迁移 活动

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

@@ -18,8 +18,8 @@ public class CodeGen {
     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;
+    private final static boolean isOldVersion = false;
+//    private final static boolean isOldVersion = true;
 
     public static void main(String[] args) {
         //配置数据源
@@ -81,7 +81,7 @@ public class CodeGen {
         //设置表前缀和只生成哪些表，setGenerateTable 未配置时，生成所有表
         globalConfig.getStrategyConfig()
                 .setTablePrefix("tb_")
-                .setGenerateTable("tb_coupon_product");
+                .setGenerateTable("tb_shop_activate_out_record");
 
         EntityConfig entityConfig = globalConfig.getEntityConfig();
         if (isOldVersion) {

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

@@ -0,0 +1,24 @@
+package com.czg.mergedata.controller;
+
+import com.czg.mergedata.common.resp.CzgResult;
+import com.czg.mergedata.cur.service.CurShopActivateService;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author GYJoker
+ */
+@RestController
+@RequestMapping("/activate")
+public class ActivateController {
+
+    @Resource
+    private CurShopActivateService curShopActivateService;
+
+    @GetMapping("/mergeActivate")
+    public CzgResult<String> mergeActivate() {
+        return curShopActivateService.mergeData();
+    }
+}

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

@@ -0,0 +1,75 @@
+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-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_activate")
+public class CurShopActivate implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    private Long shopId;
+
+    /**
+     * 充值金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 赠送金额
+     */
+    private BigDecimal giftAmount;
+
+    /**
+     * 赠送积分
+     */
+    private Integer giftPoints;
+
+    /**
+     * 是否赠送优惠卷 0否 1是
+     */
+    private Integer isGiftCoupon;
+
+    /**
+     * 优惠卷id
+     */
+    private Long couponId;
+
+    /**
+     * 优惠卷数量
+     */
+    private Integer num;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

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

@@ -0,0 +1,114 @@
+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-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_activate_in_record")
+public class CurShopActivateInRecord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 会员id
+     */
+    private Long vipUserId;
+
+    /**
+     * 卷Id (校验是否可用)
+     */
+    private Long couponId;
+
+    /**
+     * 卷描述 满10减2/商品卷
+     */
+    private String name;
+
+    /**
+     * 1-满减  2-商品
+     */
+    private Integer type;
+
+    /**
+     * 商品id
+     */
+    private Long proId;
+
+    /**
+     * 满多少金额
+     */
+    private BigDecimal fullAmount;
+
+    /**
+     * 减多少金额
+     */
+    private BigDecimal discountAmount;
+
+    /**
+     * 赠送数量
+     */
+    private Integer num;
+
+    /**
+     * 未使用数量
+     */
+    private Integer overNum;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 来源活动id
+     */
+    private Long sourceActId;
+
+    private Long sourceFlowId;
+
+    /**
+     * 可用开始时间
+     */
+    private LocalDateTime useStartTime;
+
+    /**
+     * 可用结束时间
+     */
+    private LocalDateTime useEndTime;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+    private String couponJson;
+
+    private String source;
+
+}

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

@@ -0,0 +1,79 @@
+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-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_activate_out_record")
+public class CurShopActivateOutRecord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    private Long shopId;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 商品赠送Id tb_shop_activate_in_record的id
+     */
+    private Long giveId;
+
+    /**
+     * 会员id
+     */
+    private Long vipUserId;
+
+    /**
+     * 1-满减  2-商品
+     */
+    private Integer type;
+
+    /**
+     * 使用数量
+     */
+    private Integer useNum;
+
+    /**
+     * 退单量
+     */
+    private Integer refNum;
+
+    /**
+     * 新建： create， 完成： closed, 取消：cancel,
+     */
+    private String status;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

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

@@ -0,0 +1,19 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurShopActivateInRecord;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 活动商品赠送记录表 映射层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@UseDataSource("ds1")
+public interface CurShopActivateInRecordMapper extends BaseMapper<CurShopActivateInRecord> {
+
+    @Select("truncate tb_shop_activate_in_record")
+    void truncateTable();
+}

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

@@ -0,0 +1,19 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.BaseMapper;
+import com.czg.mergedata.cur.entity.CurShopActivate;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 活动 映射层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@UseDataSource("ds1")
+public interface CurShopActivateMapper extends BaseMapper<CurShopActivate> {
+
+    @Select("truncate tb_shop_activate")
+    void truncateTable();
+}

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

@@ -0,0 +1,19 @@
+package com.czg.mergedata.cur.mapper;
+
+import com.czg.mergedata.cur.entity.CurShopActivateOutRecord;
+import com.mybatisflex.annotation.UseDataSource;
+import com.mybatisflex.core.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * 活动赠送商品使用记录表 映射层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@UseDataSource("ds1")
+public interface CurShopActivateOutRecordMapper extends BaseMapper<CurShopActivateOutRecord> {
+
+    @Select("truncate tb_shop_activate_out_record")
+    void truncateTable();
+}

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

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurShopActivateInRecord;
+
+/**
+ * 活动商品赠送记录表 服务层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+public interface CurShopActivateInRecordService extends IService<CurShopActivateInRecord> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.mergedata.cur.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.cur.entity.CurShopActivateOutRecord;
+
+/**
+ * 活动赠送商品使用记录表 服务层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+public interface CurShopActivateOutRecordService extends IService<CurShopActivateOutRecord> {
+
+}

src/main/java/com/czg/mergedata/cur/service/CurShopActivateService.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.CurShopActivate;
+
+/**
+ * 活动 服务层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+public interface CurShopActivateService extends IService<CurShopActivate> {
+
+    CzgResult<String> mergeData();
+}

src/main/java/com/czg/mergedata/cur/service/impl/CurShopActivateInRecordServiceImpl.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.CurShopActivateInRecord;
+import com.czg.mergedata.cur.mapper.CurShopActivateInRecordMapper;
+import com.czg.mergedata.cur.service.CurShopActivateInRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动商品赠送记录表 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@Service
+public class CurShopActivateInRecordServiceImpl extends ServiceImpl<CurShopActivateInRecordMapper, CurShopActivateInRecord>  implements CurShopActivateInRecordService{
+
+}

src/main/java/com/czg/mergedata/cur/service/impl/CurShopActivateOutRecordServiceImpl.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.CurShopActivateOutRecord;
+import com.czg.mergedata.cur.mapper.CurShopActivateOutRecordMapper;
+import com.czg.mergedata.cur.service.CurShopActivateOutRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动赠送商品使用记录表 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@Service
+public class CurShopActivateOutRecordServiceImpl extends ServiceImpl<CurShopActivateOutRecordMapper, CurShopActivateOutRecord>  implements CurShopActivateOutRecordService{
+
+}

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

@@ -0,0 +1,134 @@
+package com.czg.mergedata.cur.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.czg.mergedata.common.resp.CzgResult;
+import com.czg.mergedata.common.utils.PageUtils;
+import com.czg.mergedata.cur.entity.CurShopActivate;
+import com.czg.mergedata.cur.entity.CurShopActivateInRecord;
+import com.czg.mergedata.cur.entity.CurShopActivateOutRecord;
+import com.czg.mergedata.cur.mapper.CurShopActivateInRecordMapper;
+import com.czg.mergedata.cur.mapper.CurShopActivateMapper;
+import com.czg.mergedata.cur.mapper.CurShopActivateOutRecordMapper;
+import com.czg.mergedata.cur.service.CurShopActivateService;
+import com.czg.mergedata.cur.service.CurShopIdRelationService;
+import com.czg.mergedata.old.entity.OldActivate;
+import com.czg.mergedata.old.entity.OldActivateInRecord;
+import com.czg.mergedata.old.entity.OldActivateOutRecord;
+import com.czg.mergedata.old.service.OldActivateInRecordService;
+import com.czg.mergedata.old.service.OldActivateOutRecordService;
+import com.czg.mergedata.old.service.OldActivateService;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 活动 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@Service
+public class CurShopActivateServiceImpl extends ServiceImpl<CurShopActivateMapper, CurShopActivate>  implements CurShopActivateService{
+
+    @Resource
+    private CurShopIdRelationService curShopIdRelationService;
+
+    @Resource
+    private CurShopActivateOutRecordMapper curShopActivateOutRecordMapper;
+
+    @Resource
+    private CurShopActivateInRecordMapper curShopActivateInRecordMapper;
+
+    @Resource
+    private OldActivateService oldActivateService;
+
+    @Resource
+    private OldActivateInRecordService oldActivateInRecordService;
+
+    @Resource
+    private OldActivateOutRecordService oldActivateOutRecordService;
+
+    @Override
+    public CzgResult<String> mergeData() {
+        curShopActivateOutRecordMapper.truncateTable();
+        curShopActivateInRecordMapper.truncateTable();
+        getMapper().truncateTable();
+
+        Map<Long, Long> oldAndCurShopIdMap = curShopIdRelationService.getOldShopIdRelation();
+
+        execActivate(oldAndCurShopIdMap);
+        execActivateOutRecord(oldAndCurShopIdMap);
+        execActivateInRecord(oldAndCurShopIdMap);
+
+        return CzgResult.success("迁移成功");
+    }
+
+    private void execActivate(Map<Long, Long> oldAndCurShopIdMap) {
+        Page<OldActivate> page = oldActivateService.page(PageUtils.buildPage());
+
+        while (!page.getRecords().isEmpty()) {
+            saveActivate(page.getRecords(), oldAndCurShopIdMap);
+
+            page = oldActivateService.page(PageUtils.buildPage(page.getPageNumber() + 1));
+        }
+    }
+
+    private void execActivateOutRecord(Map<Long, Long> oldAndCurShopIdMap) {
+        Page<OldActivateOutRecord> page = oldActivateOutRecordService.page(PageUtils.buildPage());
+
+        while (!page.getRecords().isEmpty()) {
+            saveActivateOutRecord(page.getRecords(), oldAndCurShopIdMap);
+            page = oldActivateOutRecordService.page(PageUtils.buildPage(page.getPageNumber() + 1));
+        }
+    }
+
+    private void execActivateInRecord(Map<Long, Long> oldAndCurShopIdMap) {
+        Page<OldActivateInRecord> page = oldActivateInRecordService.page(PageUtils.buildPage());
+
+        while (!page.getRecords().isEmpty()) {
+            saveActivateInRecord(page.getRecords(), oldAndCurShopIdMap);
+            page = oldActivateInRecordService.page(PageUtils.buildPage(page.getPageNumber() + 1));
+        }
+    }
+
+    private void saveActivate(List<OldActivate> oldActivateList, Map<Long, Long> oldAndCurShopIdMap) {
+        List<CurShopActivate> curShopActivates = new ArrayList<>();
+
+        for (OldActivate oldActivate : oldActivateList) {
+            CurShopActivate bean = BeanUtil.toBean(oldActivate, CurShopActivate.class);
+            bean.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldActivate.getShopId())));
+            curShopActivates.add(bean);
+        }
+
+        saveBatch(curShopActivates);
+    }
+
+    private void saveActivateOutRecord(List<OldActivateOutRecord> oldActivateOutRecordList, Map<Long, Long> oldAndCurShopIdMap) {
+        List<CurShopActivateOutRecord> curShopActivateOutRecords = new ArrayList<>();
+
+        for (OldActivateOutRecord oldActivateOutRecord : oldActivateOutRecordList) {
+            CurShopActivateOutRecord bean = BeanUtil.toBean(oldActivateOutRecord, CurShopActivateOutRecord.class);
+            bean.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldActivateOutRecord.getShopId())));
+            curShopActivateOutRecords.add(bean);
+        }
+
+        curShopActivateOutRecordMapper.insertBatch(curShopActivateOutRecords);
+    }
+
+    private void saveActivateInRecord(List<OldActivateInRecord> oldActivateInRecordList, Map<Long, Long> oldAndCurShopIdMap) {
+        List<CurShopActivateInRecord> curShopActivateInRecords = new ArrayList<>();
+
+        for (OldActivateInRecord oldActivateInRecord : oldActivateInRecordList) {
+            CurShopActivateInRecord bean = BeanUtil.toBean(oldActivateInRecord, CurShopActivateInRecord.class);
+            bean.setShopId(oldAndCurShopIdMap.get(Long.valueOf(oldActivateInRecord.getShopId())));
+            curShopActivateInRecords.add(bean);
+        }
+
+        curShopActivateInRecordMapper.insertBatch(curShopActivateInRecords);
+    }
+}

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

@@ -295,8 +295,8 @@ public class CurSysUserServiceImpl extends ServiceImpl<CurSysUserMapper, CurSysU
 
         for (OldPlussShopStaff oldShopStaff : oldShopStaffs) {
             CurShopStaff curShopStaff = new CurShopStaff();
+            curShopStaff.setId(Long.valueOf(oldShopStaff.getId()));
             Long curShopId = oldAndCurShopIdMap.get(Long.valueOf(oldShopStaff.getShopId()));
-
             curShopStaff.setCode(oldShopStaff.getCode());
             curShopStaff.setName(oldShopStaff.getName());
             curShopStaff.setMaxDiscountAmount(oldShopStaff.getMaxDiscountAmount());

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

@@ -0,0 +1,74 @@
+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-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_activate")
+public class OldActivate implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    private Integer shopId;
+
+    /**
+     * 充值金额
+     */
+    private Integer amount;
+
+    /**
+     * 赠送金额
+     */
+    private Integer giftAmount;
+
+    /**
+     * 赠送积分
+     */
+    private Integer giftPoints;
+
+    /**
+     * 是否使用优惠卷 0否 1是
+     */
+    private Integer isUseCoupon;
+
+    /**
+     * 优惠卷id
+     */
+    private Integer couponId;
+
+    /**
+     * 优惠卷数量
+     */
+    private Integer num;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

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

@@ -0,0 +1,117 @@
+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.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-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_activate_in_record")
+public class OldActivateInRecord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 会员id
+     */
+    private Integer vipUserId;
+
+    /**
+     * 卷Id (校验是否可用)
+     */
+    private Integer couponId;
+
+    /**
+     * 卷描述 满10减2/商品卷
+     */
+    private String name;
+
+    /**
+     * 1-满减  2-商品
+     */
+    private Integer type;
+
+    /**
+     * 商品id
+     */
+    private Integer proId;
+
+    /**
+     * 满多少金额
+     */
+    private BigDecimal fullAmount;
+
+    /**
+     * 减多少金额
+     */
+    private BigDecimal discountAmount;
+
+    /**
+     * 赠送数量
+     */
+    private Integer num;
+
+    /**
+     * 未使用数量
+     */
+    private Integer overNum;
+
+    /**
+     * 店铺id
+     */
+    private Integer shopId;
+
+    /**
+     * 来源活动id
+     */
+    private Integer sourceActId;
+
+    private Integer sourceFlowId;
+
+    /**
+     * 可用开始时间
+     */
+    private LocalDateTime useStartTime;
+
+    /**
+     * 可用结束时间
+     */
+    private LocalDateTime useEndTime;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+    private String couponJson;
+
+    /**
+     * invited/activate
+     */
+    private String source;
+
+}

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

@@ -0,0 +1,79 @@
+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-18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_activate_out_record")
+public class OldActivateOutRecord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    private Integer shopId;
+
+    /**
+     * 订单id
+     */
+    private String orderId;
+
+    /**
+     * 商品赠送Id tb_activate_in_record的id
+     */
+    private Integer giveId;
+
+    /**
+     * 会员id
+     */
+    private Integer vipUserId;
+
+    /**
+     * 1-满减  2-商品
+     */
+    private Integer type;
+
+    /**
+     * 使用数量
+     */
+    private Integer useNum;
+
+    /**
+     * 退单量
+     */
+    private Integer refNum;
+
+    /**
+     * 新建： create， 完成： closed, 取消：cancel,
+     */
+    private String status;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

src/main/java/com/czg/mergedata/old/mapper/OldActivateInRecordMapper.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.OldActivateInRecord;
+
+/**
+ * 活动商品赠送记录表 映射层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@UseDataSource("ds2")
+public interface OldActivateInRecordMapper extends BaseMapper<OldActivateInRecord> {
+
+}

src/main/java/com/czg/mergedata/old/mapper/OldActivateMapper.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.OldActivate;
+
+/**
+ *  映射层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@UseDataSource("ds2")
+public interface OldActivateMapper extends BaseMapper<OldActivate> {
+
+}

src/main/java/com/czg/mergedata/old/mapper/OldActivateOutRecordMapper.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.OldActivateOutRecord;
+
+/**
+ * 活动赠送商品使用记录表 映射层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@UseDataSource("ds2")
+public interface OldActivateOutRecordMapper extends BaseMapper<OldActivateOutRecord> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.old.entity.OldActivateInRecord;
+
+/**
+ * 活动商品赠送记录表 服务层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+public interface OldActivateInRecordService extends IService<OldActivateInRecord> {
+
+}

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

@@ -0,0 +1,14 @@
+package com.czg.mergedata.old.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.mergedata.old.entity.OldActivateOutRecord;
+
+/**
+ * 活动赠送商品使用记录表 服务层。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+public interface OldActivateOutRecordService extends IService<OldActivateOutRecord> {
+
+}

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

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

src/main/java/com/czg/mergedata/old/service/impl/OldActivateInRecordServiceImpl.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.OldActivateInRecord;
+import com.czg.mergedata.old.mapper.OldActivateInRecordMapper;
+import com.czg.mergedata.old.service.OldActivateInRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动商品赠送记录表 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@Service
+public class OldActivateInRecordServiceImpl extends ServiceImpl<OldActivateInRecordMapper, OldActivateInRecord>  implements OldActivateInRecordService{
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldActivateOutRecordServiceImpl.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.OldActivateOutRecord;
+import com.czg.mergedata.old.mapper.OldActivateOutRecordMapper;
+import com.czg.mergedata.old.service.OldActivateOutRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 活动赠送商品使用记录表 服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@Service
+public class OldActivateOutRecordServiceImpl extends ServiceImpl<OldActivateOutRecordMapper, OldActivateOutRecord>  implements OldActivateOutRecordService{
+
+}

src/main/java/com/czg/mergedata/old/service/impl/OldActivateServiceImpl.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.OldActivate;
+import com.czg.mergedata.old.mapper.OldActivateMapper;
+import com.czg.mergedata.old.service.OldActivateService;
+import org.springframework.stereotype.Service;
+
+/**
+ *  服务层实现。
+ *
+ * @author mac
+ * @since 2025-02-18
+ */
+@Service
+public class OldActivateServiceImpl extends ServiceImpl<OldActivateMapper, OldActivate>  implements OldActivateService{
+
+}

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

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

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

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

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

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