czg_team/merge_data
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付方式同步

Browse Source
This commit is contained in:
张松
2025-03-25 14:39:02 +08:00
parent fc4858dcd8
commit 04352f6ff1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/czg/mergedata/common/utils/CodeGen.java
View File

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

2
src/main/java/com/czg/mergedata/cur/service/impl/CurConsInfoServiceImpl.java
View File

@@ -63,7 +63,6 @@ public class CurConsInfoServiceImpl extends ServiceImpl<CurConsInfoMapper, CurCo
mergeConsGroup(); mergeConsGroup();
mergeConsInfo(); mergeConsInfo();
mergeProdConsRelation(); mergeProdConsRelation();
return CzgResult.success("合并耗材数据成功"); return CzgResult.success("合并耗材数据成功");
} }
@@ -106,6 +105,7 @@ public class CurConsInfoServiceImpl extends ServiceImpl<CurConsInfoMapper, CurCo
curConsInfo.setDefaultUnit(oldConsInfo.getDefaultUnit()); curConsInfo.setDefaultUnit(oldConsInfo.getDefaultUnit());
curConsInfo.setCreateTime(oldConsInfo.getCreateTime()); curConsInfo.setCreateTime(oldConsInfo.getCreateTime());
curConsInfo.setUpdateTime(oldConsInfo.getUpdateTime()); curConsInfo.setUpdateTime(oldConsInfo.getUpdateTime());
curConsInfos.add(curConsInfo);
}); });
saveBatch(curConsInfos); saveBatch(curConsInfos);