From f50e081f650eb067cce44fce3db64a237fde145b Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 20 Apr 2021 13:44:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java index e12109a..eccda8a 100644 --- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java +++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java @@ -3,6 +3,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.bean.SysCompany; +import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.BusParameterSettingsDao; import com.matrix.system.common.dao.SysCompanyDao; import com.matrix.system.hive.bean.ParameterSettings; @@ -53,6 +54,29 @@ newSetting1.setCategory("APP设置"); newSettings.add(newSetting1); + ParameterSettings newSetting2=new ParameterSettings(); + newSetting2.setCode(AppConstance.WAREHOUSE_MANAGE_STOCK); + newSetting2.setName("是否管理产品库存"); + newSetting2.setType(1); + newSetting2.setCategory("仓库设置"); + newSettings.add(newSetting2); + + ParameterSettings newSetting3=new ParameterSettings(); + newSetting3.setCode(AppConstance.WECHARPAY_RECHARGE_NOTIFYURL); + newSetting3.setName("储值卡充值回调地址"); + newSetting3.setType(1); + newSetting3.setCategory("微信开发配置"); + newSettings.add(newSetting3); + + ParameterSettings newSetting4=new ParameterSettings(); + newSetting4.setCode(AppConstance.SHOP_MANAGE_JJCPAS_CONSUME); + newSetting4.setName("家居产品销售是否生成消耗业绩"); + newSetting4.setType(1); + newSetting4.setCategory("店务配置"); + newSettings.add(newSetting4); + + + for (ParameterSettings newSetting : newSettings) { List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting); if(CollectionUtil.isEmpty(parameterSettings)){ -- Gitblit v1.9.1