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 3742808..06aaf6a 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 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_print_machine_log", "tb_print_machine"); + .setGenerateTable("tb_shop_storage", "tb_shop_storage_good", "tb_shop_storage_record"); EntityConfig entityConfig = globalConfig.getEntityConfig(); if (isOldVersion) { diff --git a/src/main/java/com/czg/mergedata/controller/ShopInfoController.java b/src/main/java/com/czg/mergedata/controller/ShopInfoController.java new file mode 100644 index 0000000..ff672bf --- /dev/null +++ b/src/main/java/com/czg/mergedata/controller/ShopInfoController.java @@ -0,0 +1,23 @@ +package com.czg.mergedata.controller; + +import com.czg.mergedata.common.resp.CzgResult; +import com.czg.mergedata.cur.service.CurShopStorageService; +import jakarta.annotation.Resource; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author GYJoker + */ +@RestController +@RequestMapping("/shopInfo") +public class ShopInfoController { + + @Resource + private CurShopStorageService curShopStorageService; + + @RequestMapping("/storage") + public CzgResult mergeShopStorage() { + return curShopStorageService.mergeData(); + } +} diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurShopStorage.java b/src/main/java/com/czg/mergedata/cur/entity/CurShopStorage.java new file mode 100644 index 0000000..f94ff21 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurShopStorage.java @@ -0,0 +1,95 @@ +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-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_storage") +public class CurShopStorage implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 酒品名 + */ + private String name; + + /** + * 酒品图 + */ + private String imgUrl; + + /** + * 单位 + */ + private String unit; + + /** + * 数量 + */ + private Integer num; + + /** + * 0：已取完；1：未取完；2：已过期 + */ + private Integer status; + + /** + * 到期时间 + */ + private LocalDateTime expTime; + + /** + * 存酒时间 + */ + private LocalDateTime savTime; + + /** + * 用户Id + */ + private Long userId; + + /** + * 用户头像 + */ + private String headImg; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户电话 + */ + private String phone; + + /** + * 店铺id + */ + private Long shopId; + +} diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurShopStorageGood.java b/src/main/java/com/czg/mergedata/cur/entity/CurShopStorageGood.java new file mode 100644 index 0000000..d065a76 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurShopStorageGood.java @@ -0,0 +1,72 @@ +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-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_storage_good") +public class CurShopStorageGood implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 酒品名 + */ + private String name; + + /** + * 图片地址 + */ + private String imgUrl; + + /** + * 单位 + */ + private String unit; + + /** + * 有效期(天) + */ + private Integer period; + + /** + * 0:未删除；1:已删除 + */ + private Integer isDel; + + private LocalDateTime createTime; + + /** + * 0:手动；1:商品； + */ + private Integer source; + + /** + * 商户Id + */ + private Long shopId; + +} diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurShopStorageRecord.java b/src/main/java/com/czg/mergedata/cur/entity/CurShopStorageRecord.java new file mode 100644 index 0000000..ba16997 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurShopStorageRecord.java @@ -0,0 +1,50 @@ +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-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_storage_record") +public class CurShopStorageRecord implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Auto) + private Long id; + + /** + * 存酒信息id + */ + private Long storageId; + + /** + * 记录 + */ + private String content; + + /** + * 操作时间 + */ + private LocalDateTime time; + +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageGoodMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageGoodMapper.java new file mode 100644 index 0000000..5d29846 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageGoodMapper.java @@ -0,0 +1,16 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurShopStorageGood; +import org.apache.ibatis.annotations.Select; + +/** + * 酒品表 映射层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface CurShopStorageGoodMapper extends BaseMapper { + @Select("truncate tb_shop_storage_good") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageMapper.java new file mode 100644 index 0000000..8fe0955 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageMapper.java @@ -0,0 +1,16 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurShopStorage; +import org.apache.ibatis.annotations.Select; + +/** + * 用户存酒 映射层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface CurShopStorageMapper extends BaseMapper { + @Select("truncate tb_shop_storage") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageRecordMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageRecordMapper.java new file mode 100644 index 0000000..447ef90 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopStorageRecordMapper.java @@ -0,0 +1,16 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurShopStorageRecord; +import org.apache.ibatis.annotations.Select; + +/** + * 存取酒记录表 映射层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface CurShopStorageRecordMapper extends BaseMapper { + @Select("truncate tb_shop_storage_record") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurShopStorageGoodService.java b/src/main/java/com/czg/mergedata/cur/service/CurShopStorageGoodService.java new file mode 100644 index 0000000..7fc0b17 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurShopStorageGoodService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.cur.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.cur.entity.CurShopStorageGood; + +/** + * 酒品表 服务层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface CurShopStorageGoodService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurShopStorageRecordService.java b/src/main/java/com/czg/mergedata/cur/service/CurShopStorageRecordService.java new file mode 100644 index 0000000..45c6672 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurShopStorageRecordService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.cur.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.cur.entity.CurShopStorageRecord; + +/** + * 存取酒记录表 服务层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface CurShopStorageRecordService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurShopStorageService.java b/src/main/java/com/czg/mergedata/cur/service/CurShopStorageService.java new file mode 100644 index 0000000..cad456a --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurShopStorageService.java @@ -0,0 +1,15 @@ +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.CurShopStorage; + +/** + * 用户存酒 服务层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface CurShopStorageService extends IService { + CzgResult mergeData(); +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageGoodServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageGoodServiceImpl.java new file mode 100644 index 0000000..f85a12b --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageGoodServiceImpl.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.CurShopStorageGood; +import com.czg.mergedata.cur.mapper.CurShopStorageGoodMapper; +import com.czg.mergedata.cur.service.CurShopStorageGoodService; +import org.springframework.stereotype.Service; + +/** + * 酒品表 服务层实现。 + * + * @author mac + * @since 2025-03-14 + */ +@Service +public class CurShopStorageGoodServiceImpl extends ServiceImpl implements CurShopStorageGoodService{ + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageRecordServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageRecordServiceImpl.java new file mode 100644 index 0000000..580d592 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageRecordServiceImpl.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.CurShopStorageRecord; +import com.czg.mergedata.cur.mapper.CurShopStorageRecordMapper; +import com.czg.mergedata.cur.service.CurShopStorageRecordService; +import org.springframework.stereotype.Service; + +/** + * 存取酒记录表 服务层实现。 + * + * @author mac + * @since 2025-03-14 + */ +@Service +public class CurShopStorageRecordServiceImpl extends ServiceImpl implements CurShopStorageRecordService{ + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageServiceImpl.java new file mode 100644 index 0000000..1f94ee0 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopStorageServiceImpl.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.CurShopStorageGood; +import com.czg.mergedata.cur.entity.CurShopStorageRecord; +import com.czg.mergedata.cur.mapper.CurShopStorageGoodMapper; +import com.czg.mergedata.cur.mapper.CurShopStorageRecordMapper; +import com.czg.mergedata.old.entity.OldShopStorage; +import com.czg.mergedata.old.entity.OldShopStorageGood; +import com.czg.mergedata.old.entity.OldShopStorageRecord; +import com.czg.mergedata.old.service.OldShopStorageGoodService; +import com.czg.mergedata.old.service.OldShopStorageRecordService; +import com.czg.mergedata.old.service.OldShopStorageService; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import com.czg.mergedata.cur.entity.CurShopStorage; +import com.czg.mergedata.cur.mapper.CurShopStorageMapper; +import com.czg.mergedata.cur.service.CurShopStorageService; +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-14 + */ +@Service +public class CurShopStorageServiceImpl extends ServiceImpl implements CurShopStorageService { + + @Resource + private CurShopStorageRecordMapper curShopStorageRecordMapper; + + @Resource + private CurShopStorageGoodMapper curShopStorageGoodMapper; + + @Resource + private OldShopStorageService oldShopStorageService; + + @Resource + private OldShopStorageGoodService oldShopStorageGoodService; + + @Resource + private OldShopStorageRecordService oldShopStorageRecordService; + + @Override + @Transactional + public CzgResult mergeData() { + getMapper().truncateTable(); + curShopStorageRecordMapper.truncateTable(); + curShopStorageGoodMapper.truncateTable(); + + mergeStorage(); + mergeStorageRecord(); + mergeStorageGood(); + + return CzgResult.success("数据合并成功"); + } + + private void mergeStorage() { + List list = oldShopStorageService.list(); + + List curShopStorageList = new ArrayList<>(); + for (OldShopStorage oldShopStorage : list) { + CurShopStorage storage = BeanUtil.toBean(oldShopStorage, CurShopStorage.class); + curShopStorageList.add(storage); + } + + saveBatch(curShopStorageList); + } + + private void mergeStorageRecord() { + List list = oldShopStorageRecordService.list(); + List curShopStorageRecordList = new ArrayList<>(); + for (OldShopStorageRecord oldShopStorageRecord : list) { + CurShopStorageRecord record = BeanUtil.toBean(oldShopStorageRecord, CurShopStorageRecord.class); + curShopStorageRecordList.add(record); + } + curShopStorageRecordMapper.insertBatch(curShopStorageRecordList); + } + + private void mergeStorageGood() { + List list = oldShopStorageGoodService.list(); + List curShopStorageGoodList = new ArrayList<>(); + for (OldShopStorageGood oldShopStorageGood : list) { + CurShopStorageGood good = BeanUtil.toBean(oldShopStorageGood, CurShopStorageGood.class); + curShopStorageGoodList.add(good); + } + curShopStorageGoodMapper.insertBatch(curShopStorageGoodList); + } +} diff --git a/src/main/java/com/czg/mergedata/old/entity/OldShopStorage.java b/src/main/java/com/czg/mergedata/old/entity/OldShopStorage.java new file mode 100644 index 0000000..6449a39 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/entity/OldShopStorage.java @@ -0,0 +1,95 @@ +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.time.LocalDateTime; + +import java.io.Serial; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 用户存酒 实体类。 + * + * @author mac + * @since 2025-03-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_storage") +public class OldShopStorage implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Auto) + private Integer id; + + /** + * 酒品名 + */ + private String name; + + /** + * 酒品图 + */ + private String imgUrl; + + /** + * 单位 + */ + private String unit; + + /** + * 数量 + */ + private Integer num; + + /** + * 0：已取完；1：未取完；2：已过期 + */ + private Integer status; + + /** + * 到期时间 + */ + private LocalDateTime expTime; + + /** + * 存酒时间 + */ + private LocalDateTime savTime; + + /** + * 用户Id + */ + private Integer userId; + + /** + * 用户头像 + */ + private String headImg; + + /** + * 用户昵称 + */ + private String nickName; + + /** + * 用户电话 + */ + private String telphone; + + /** + * 店铺id + */ + private Integer shopId; + +} diff --git a/src/main/java/com/czg/mergedata/old/entity/OldShopStorageGood.java b/src/main/java/com/czg/mergedata/old/entity/OldShopStorageGood.java new file mode 100644 index 0000000..6d7f87e --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/entity/OldShopStorageGood.java @@ -0,0 +1,72 @@ +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.time.LocalDateTime; + +import java.io.Serial; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 酒品表 实体类。 + * + * @author mac + * @since 2025-03-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_storage_good") +public class OldShopStorageGood implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Auto) + private Integer id; + + /** + * 酒品名 + */ + private String name; + + /** + * 图片地址 + */ + private String imgUrl; + + /** + * 单位 + */ + private String unit; + + /** + * 有效期(天) + */ + private Integer period; + + /** + * 0:未删除；1:已删除 + */ + private Integer isDel; + + private LocalDateTime createTime; + + /** + * 0:手动；1:商品； + */ + private Integer source; + + /** + * 商户Id + */ + private Integer shopId; + +} diff --git a/src/main/java/com/czg/mergedata/old/entity/OldShopStorageRecord.java b/src/main/java/com/czg/mergedata/old/entity/OldShopStorageRecord.java new file mode 100644 index 0000000..ff4057e --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/entity/OldShopStorageRecord.java @@ -0,0 +1,50 @@ +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.time.LocalDateTime; + +import java.io.Serial; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 存取酒记录表 实体类。 + * + * @author mac + * @since 2025-03-14 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_storage_record") +public class OldShopStorageRecord implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + @Id(keyType = KeyType.Auto) + private Integer id; + + /** + * 存酒信息id + */ + private Integer storageId; + + /** + * 记录 + */ + private String content; + + /** + * 操作时间 + */ + private LocalDateTime time; + +} diff --git a/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageGoodMapper.java b/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageGoodMapper.java new file mode 100644 index 0000000..1c6c146 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageGoodMapper.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.OldShopStorageGood; + +/** + * 酒品表 映射层。 + * + * @author mac + * @since 2025-03-14 + */ +@UseDataSource("ds2") +public interface OldShopStorageGoodMapper extends BaseMapper { + +} diff --git a/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageMapper.java b/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageMapper.java new file mode 100644 index 0000000..a023ce2 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageMapper.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.OldShopStorage; + +/** + * 用户存酒 映射层。 + * + * @author mac + * @since 2025-03-14 + */ +@UseDataSource("ds2") +public interface OldShopStorageMapper extends BaseMapper { + +} diff --git a/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageRecordMapper.java b/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageRecordMapper.java new file mode 100644 index 0000000..faa43cc --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/mapper/OldShopStorageRecordMapper.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.OldShopStorageRecord; + +/** + * 存取酒记录表 映射层。 + * + * @author mac + * @since 2025-03-14 + */ +@UseDataSource("ds2") +public interface OldShopStorageRecordMapper extends BaseMapper { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/OldShopStorageGoodService.java b/src/main/java/com/czg/mergedata/old/service/OldShopStorageGoodService.java new file mode 100644 index 0000000..984b999 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/OldShopStorageGoodService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.old.entity.OldShopStorageGood; + +/** + * 酒品表 服务层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface OldShopStorageGoodService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/OldShopStorageRecordService.java b/src/main/java/com/czg/mergedata/old/service/OldShopStorageRecordService.java new file mode 100644 index 0000000..1e67798 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/OldShopStorageRecordService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.old.entity.OldShopStorageRecord; + +/** + * 存取酒记录表 服务层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface OldShopStorageRecordService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/OldShopStorageService.java b/src/main/java/com/czg/mergedata/old/service/OldShopStorageService.java new file mode 100644 index 0000000..f8f8546 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/OldShopStorageService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.old.entity.OldShopStorage; + +/** + * 用户存酒 服务层。 + * + * @author mac + * @since 2025-03-14 + */ +public interface OldShopStorageService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageGoodServiceImpl.java b/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageGoodServiceImpl.java new file mode 100644 index 0000000..e9fea0a --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageGoodServiceImpl.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.OldShopStorageGood; +import com.czg.mergedata.old.mapper.OldShopStorageGoodMapper; +import com.czg.mergedata.old.service.OldShopStorageGoodService; +import org.springframework.stereotype.Service; + +/** + * 酒品表 服务层实现。 + * + * @author mac + * @since 2025-03-14 + */ +@Service +public class OldShopStorageGoodServiceImpl extends ServiceImpl implements OldShopStorageGoodService{ + +} diff --git a/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageRecordServiceImpl.java b/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageRecordServiceImpl.java new file mode 100644 index 0000000..089eda1 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageRecordServiceImpl.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.OldShopStorageRecord; +import com.czg.mergedata.old.mapper.OldShopStorageRecordMapper; +import com.czg.mergedata.old.service.OldShopStorageRecordService; +import org.springframework.stereotype.Service; + +/** + * 存取酒记录表 服务层实现。 + * + * @author mac + * @since 2025-03-14 + */ +@Service +public class OldShopStorageRecordServiceImpl extends ServiceImpl implements OldShopStorageRecordService{ + +} diff --git a/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageServiceImpl.java b/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageServiceImpl.java new file mode 100644 index 0000000..fa3bd5c --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/impl/OldShopStorageServiceImpl.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.OldShopStorage; +import com.czg.mergedata.old.mapper.OldShopStorageMapper; +import com.czg.mergedata.old.service.OldShopStorageService; +import org.springframework.stereotype.Service; + +/** + * 用户存酒 服务层实现。 + * + * @author mac + * @since 2025-03-14 + */ +@Service +public class OldShopStorageServiceImpl extends ServiceImpl implements OldShopStorageService{ + +} diff --git a/src/main/resources/mapper/cur/ShopStorageGoodMapper.xml b/src/main/resources/mapper/cur/ShopStorageGoodMapper.xml new file mode 100644 index 0000000..90717c3 --- /dev/null +++ b/src/main/resources/mapper/cur/ShopStorageGoodMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/cur/ShopStorageMapper.xml b/src/main/resources/mapper/cur/ShopStorageMapper.xml new file mode 100644 index 0000000..af2b438 --- /dev/null +++ b/src/main/resources/mapper/cur/ShopStorageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/cur/ShopStorageRecordMapper.xml b/src/main/resources/mapper/cur/ShopStorageRecordMapper.xml new file mode 100644 index 0000000..73fb4b2 --- /dev/null +++ b/src/main/resources/mapper/cur/ShopStorageRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/old/ShopStorageGoodMapper.xml b/src/main/resources/mapper/old/ShopStorageGoodMapper.xml new file mode 100644 index 0000000..a48143a --- /dev/null +++ b/src/main/resources/mapper/old/ShopStorageGoodMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/old/ShopStorageMapper.xml b/src/main/resources/mapper/old/ShopStorageMapper.xml new file mode 100644 index 0000000..229fd1d --- /dev/null +++ b/src/main/resources/mapper/old/ShopStorageMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/old/ShopStorageRecordMapper.xml b/src/main/resources/mapper/old/ShopStorageRecordMapper.xml new file mode 100644 index 0000000..edcde87 --- /dev/null +++ b/src/main/resources/mapper/old/ShopStorageRecordMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index 44fa865..bb36e1a 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -137,3 +137,11 @@ - tb_print_machine_log 表 +### 20. 存酒 +> /merge/shopInfo/storage +#### 执行表 +- tb_shop_storage_good 表 +- tb_shop_storage_record 表 +- tb_shop_storage 表 + +