From 1d394446abb8465e63fd1fd9a768796e149edbd6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:52:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 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 a29c349..a3fab25 100644
--- a/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
+++ b/zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java
@@ -6,6 +6,7 @@
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.constance.Dictionary;
import com.matrix.system.hive.bean.ParameterSettings;
import com.matrix.system.hive.dao.ParameterSettingsDao;
import org.junit.Test;
@@ -68,7 +69,41 @@
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);
+ ParameterSettings newSetting5=new ParameterSettings();
+ newSetting5.setCode(AppConstance.WX_ORDER_NOTICE_DINGDING_TOKEN);
+ newSetting5.setName("钉钉通知token");
+ newSetting5.setType(1);
+ newSetting5.setCategory("微商城配置");
+ newSettings.add(newSetting5);
+
+ ParameterSettings newSetting6=new ParameterSettings();
+ newSetting6.setCode(Dictionary.ZS_CONSUME_ACHIEVE);
+ newSetting6.setName("赠送项目是否计算消耗业绩");
+ newSetting6.setType(1);
+ newSetting6.setCategory("店务配置");
+ newSettings.add(newSetting6);
+
+ ParameterSettings newSetting7=new ParameterSettings();
+ newSetting7.setCode(AppConstance.SHOP_MANAGE_GIFTISFREE);
+ newSetting7.setName("赠送金额购买产品算赠送购买");
+ newSetting7.setType(1);
+ newSetting7.setCategory("店务配置");
+ newSettings.add(newSetting7);
+
+
+ ParameterSettings newSetting8=new ParameterSettings();
+ newSetting8.setCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER);
+ newSetting8.setName("门店是否只能取消待付款订单,服务单");
+ newSetting8.setType(1);
+ newSetting8.setCategory("店务配置");
+ newSettings.add(newSetting8);
for (ParameterSettings newSetting : newSettings) {
--
Gitblit v1.9.1