From 1c7e5a44b5b3e90f38a050978331526abc58fcb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 25 Mar 2025 11:29:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopInfoController.java | 8 ++ .../mergedata/cur/entity/CurShopPayType.java | 103 ++++++++++++++++++ .../cur/mapper/CurShopPayTypeMapper.java | 16 +++ .../cur/service/CurShopPayTypeService.java | 17 +++ .../impl/CurShopPayTypeServiceImpl.java | 36 ++++++ .../mergedata/old/entity/OldShopPayType.java | 96 ++++++++++++++++ .../old/mapper/OldShopPayTypeMapper.java | 14 +++ .../old/service/OldShopPayTypeService.java | 14 +++ .../impl/OldShopPayTypeServiceImpl.java | 18 +++ .../mapper/cur/ShopPayTypeMapper.xml | 7 ++ .../mapper/old/ShopPayTypeMapper.xml | 7 ++ 11 files changed, 336 insertions(+) create mode 100644 src/main/java/com/czg/mergedata/cur/entity/CurShopPayType.java create mode 100644 src/main/java/com/czg/mergedata/cur/mapper/CurShopPayTypeMapper.java create mode 100644 src/main/java/com/czg/mergedata/cur/service/CurShopPayTypeService.java create mode 100644 src/main/java/com/czg/mergedata/cur/service/impl/CurShopPayTypeServiceImpl.java create mode 100644 src/main/java/com/czg/mergedata/old/entity/OldShopPayType.java create mode 100644 src/main/java/com/czg/mergedata/old/mapper/OldShopPayTypeMapper.java create mode 100644 src/main/java/com/czg/mergedata/old/service/OldShopPayTypeService.java create mode 100644 src/main/java/com/czg/mergedata/old/service/impl/OldShopPayTypeServiceImpl.java create mode 100644 src/main/resources/mapper/cur/ShopPayTypeMapper.xml create mode 100644 src/main/resources/mapper/old/ShopPayTypeMapper.xml diff --git a/src/main/java/com/czg/mergedata/controller/ShopInfoController.java b/src/main/java/com/czg/mergedata/controller/ShopInfoController.java index 9d0c94e..d20c507 100644 --- a/src/main/java/com/czg/mergedata/controller/ShopInfoController.java +++ b/src/main/java/com/czg/mergedata/controller/ShopInfoController.java @@ -46,6 +46,9 @@ public class ShopInfoController { @Resource private CurConsInfoService curConsInfoService; + @Resource + private CurShopPayTypeService curShopPayTypeService; + @RequestMapping("/consInfo") public CzgResult consInfo() { return curConsInfoService.mergeConsData(); @@ -100,4 +103,9 @@ public class ShopInfoController { public CzgResult mergeShopAd() { return curShopAdService.mergeShopAd(); } + + @RequestMapping("/payType") + public CzgResult mergePayType() { + return curShopPayTypeService.mergeData(); + } } diff --git a/src/main/java/com/czg/mergedata/cur/entity/CurShopPayType.java b/src/main/java/com/czg/mergedata/cur/entity/CurShopPayType.java new file mode 100644 index 0000000..cec8bdd --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/entity/CurShopPayType.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 Administrator + * @since 2025-03-25 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_pay_type") +public class CurShopPayType implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 自增id + */ + @Id(keyType = KeyType.Auto) + private Integer id; + + /** + * 支付类型cash,alipay,weixin,deposit,arrears,virtual,member-account + */ + private String payType; + + /** + * 支付类型名称支付类型名称：现金，支付宝，刷卡deposit，挂单arrears，储值member-account自定义virtual + */ + private String payName; + + /** + * 是否快捷展示1是0否 + */ + private Integer isShowShortcut; + + /** + * 店铺id + */ + private Long shopId; + + /** + * 0允许退款 1-不允许退款 + */ + private Integer isRefundable; + + /** + * 是否打开钱箱 + */ + private Integer isOpenCashDrawer; + + /** + * 0不是 1是 [系统级支付] + */ + private Integer isSystem; + + /** + * 0-非虚拟 1虚拟 virtual + */ + private Integer isIdeal; + + /** + * 0-不显示1显示 + */ + private Integer isDisplay; + + /** + * 排序 + */ + private Integer sorts; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 图标 + */ + private String icon; + +} diff --git a/src/main/java/com/czg/mergedata/cur/mapper/CurShopPayTypeMapper.java b/src/main/java/com/czg/mergedata/cur/mapper/CurShopPayTypeMapper.java new file mode 100644 index 0000000..08acc55 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/mapper/CurShopPayTypeMapper.java @@ -0,0 +1,16 @@ +package com.czg.mergedata.cur.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.cur.entity.CurShopPayType; +import org.apache.ibatis.annotations.Select; + +/** + * 店铺支付类型 映射层。 + * + * @author Administrator + * @since 2025-03-25 + */ +public interface CurShopPayTypeMapper extends BaseMapper { + @Select("truncate tb_shop_pay_type") + void truncateTable(); +} diff --git a/src/main/java/com/czg/mergedata/cur/service/CurShopPayTypeService.java b/src/main/java/com/czg/mergedata/cur/service/CurShopPayTypeService.java new file mode 100644 index 0000000..e9b7eb8 --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/CurShopPayTypeService.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.CurShopPayType; + +/** + * 店铺支付类型 服务层。 + * + * @author Administrator + * @since 2025-03-25 + */ +public interface CurShopPayTypeService extends IService { + + CzgResult mergeData(); + +} diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurShopPayTypeServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopPayTypeServiceImpl.java new file mode 100644 index 0000000..721e97c --- /dev/null +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurShopPayTypeServiceImpl.java @@ -0,0 +1,36 @@ +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.old.service.OldShopPayTypeService; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import com.czg.mergedata.cur.entity.CurShopPayType; +import com.czg.mergedata.cur.mapper.CurShopPayTypeMapper; +import com.czg.mergedata.cur.service.CurShopPayTypeService; +import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; + +/** + * 店铺支付类型 服务层实现。 + * + * @author Administrator + * @since 2025-03-25 + */ +@Service +public class CurShopPayTypeServiceImpl extends ServiceImpl implements CurShopPayTypeService{ + @Resource + private OldShopPayTypeService oldShopPayTypeService; + + @Override + public CzgResult mergeData() { + mapper.truncateTable(); + oldShopPayTypeService.list().forEach(item -> { + CurShopPayType payType = BeanUtil.copyProperties(item, CurShopPayType.class); + payType.setCreateTime(DateUtil.date(item.getCreatedAt()).toLocalDateTime()); + payType.setUpdateTime(DateUtil.date(item.getUpdatedAt()).toLocalDateTime()); + save(payType); + }); + return null; + } +} diff --git a/src/main/java/com/czg/mergedata/old/entity/OldShopPayType.java b/src/main/java/com/czg/mergedata/old/entity/OldShopPayType.java new file mode 100644 index 0000000..4e586a0 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/entity/OldShopPayType.java @@ -0,0 +1,96 @@ +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 Administrator + * @since 2025-03-25 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Table("tb_shop_pay_type") +public class OldShopPayType implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 自增id + */ + @Id(keyType = KeyType.Auto) + private Integer id; + + /** + * 支付类型cash,alipay,weixin,deposit,arrears,virtual,member-account + */ + private String payType; + + /** + * 支付类型名称支付类型名称：现金，支付宝，刷卡deposit，挂单arrears，储值member-account自定义virtual + */ + private String payName; + + /** + * 是否快捷展示1是0否 + */ + private Integer isShowShortcut; + + /** + * 店铺id + */ + private String shopId; + + /** + * 0允许退款 1-不允许退款 + */ + private Integer isRefundable; + + /** + * 是否打开钱箱 + */ + private Integer isOpenCashDrawer; + + /** + * 0不是 1是 [系统级支付] + */ + private Integer isSystem; + + /** + * 0-非虚拟 1虚拟 virtual + */ + private Integer isIdeal; + + /** + * 0-不显示1显示 + */ + private Integer isDisplay; + + /** + * 排序 + */ + private Integer sorts; + + private Long createdAt; + + private Long updatedAt; + + /** + * 图标 + */ + private String icon; + +} diff --git a/src/main/java/com/czg/mergedata/old/mapper/OldShopPayTypeMapper.java b/src/main/java/com/czg/mergedata/old/mapper/OldShopPayTypeMapper.java new file mode 100644 index 0000000..51010fc --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/mapper/OldShopPayTypeMapper.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.mapper; + +import com.mybatisflex.core.BaseMapper; +import com.czg.mergedata.old.entity.OldShopPayType; + +/** + * 映射层。 + * + * @author Administrator + * @since 2025-03-25 + */ +public interface OldShopPayTypeMapper extends BaseMapper { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/OldShopPayTypeService.java b/src/main/java/com/czg/mergedata/old/service/OldShopPayTypeService.java new file mode 100644 index 0000000..3a4172f --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/OldShopPayTypeService.java @@ -0,0 +1,14 @@ +package com.czg.mergedata.old.service; + +import com.mybatisflex.core.service.IService; +import com.czg.mergedata.old.entity.OldShopPayType; + +/** + * 服务层。 + * + * @author Administrator + * @since 2025-03-25 + */ +public interface OldShopPayTypeService extends IService { + +} diff --git a/src/main/java/com/czg/mergedata/old/service/impl/OldShopPayTypeServiceImpl.java b/src/main/java/com/czg/mergedata/old/service/impl/OldShopPayTypeServiceImpl.java new file mode 100644 index 0000000..b6e73b0 --- /dev/null +++ b/src/main/java/com/czg/mergedata/old/service/impl/OldShopPayTypeServiceImpl.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.OldShopPayType; +import com.czg.mergedata.old.mapper.OldShopPayTypeMapper; +import com.czg.mergedata.old.service.OldShopPayTypeService; +import org.springframework.stereotype.Service; + +/** + * 服务层实现。 + * + * @author Administrator + * @since 2025-03-25 + */ +@Service +public class OldShopPayTypeServiceImpl extends ServiceImpl implements OldShopPayTypeService{ + +} diff --git a/src/main/resources/mapper/cur/ShopPayTypeMapper.xml b/src/main/resources/mapper/cur/ShopPayTypeMapper.xml new file mode 100644 index 0000000..f77b7d7 --- /dev/null +++ b/src/main/resources/mapper/cur/ShopPayTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/src/main/resources/mapper/old/ShopPayTypeMapper.xml b/src/main/resources/mapper/old/ShopPayTypeMapper.xml new file mode 100644 index 0000000..4b8c2e5 --- /dev/null +++ b/src/main/resources/mapper/old/ShopPayTypeMapper.xml @@ -0,0 +1,7 @@ + + + + + From fc4858dcd8ac8d035d3624cd7fb7c20cca97d8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 25 Mar 2025 14:38:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 收银机数据迁移关系.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/收银机数据迁移关系.md b/收银机数据迁移关系.md index 99dae93..cb16e89 100644 --- a/收银机数据迁移关系.md +++ b/收银机数据迁移关系.md @@ -220,5 +220,11 @@ - tb_shop_table_order_statistic 表 +### 31. 支付方式 +> /merge/shopInfo/payType +#### 执行表 +- tb_shop_pay_type 表 + + From 04352f6ff14e00bcec502f1d0088274353ca7bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 25 Mar 2025 14:39:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/czg/mergedata/common/utils/CodeGen.java | 6 +++--- .../mergedata/cur/service/impl/CurConsInfoServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) 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 60c8bda..abb6d07 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_order_statistic", "tb_shop_prod_statistic", "tb_shop_table_order_statistic"); + .setGenerateTable("tb_shop_pay_type"); EntityConfig entityConfig = globalConfig.getEntityConfig(); if (IS_OLD_VERSION) { diff --git a/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java b/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java index bd0c897..d422f8a 100644 --- a/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java +++ b/src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java @@ -63,7 +63,6 @@ public class CurConsInfoServiceImpl extends ServiceImpl