From f9fab7b4d668a5f77136d18f0fc7314b763206eb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 16 Mar 2021 17:09:01 +0800
Subject: [PATCH] 分销订单0316
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
index 6060596..865f5da 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
@@ -1,5 +1,6 @@
package com.matrix.system.fenxiao.action;
+import com.matrix.biz.dao.BizUserDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
@@ -41,6 +42,9 @@
@Autowired
private ShoppingGoodsDao shoppingGoodsDao;
+
+ @Autowired
+ private BizUserDao bizUserDao;
/**
*查询分销配置
@@ -79,6 +83,7 @@
result.putInMap("sqtj", sqtjRuleSettingsVo);
if(CollUtil.isNotEmpty(sqtjRuleSettingsVo)){
for(FenXiaoSettingVo fenXiaoSettingVo : sqtjRuleSettingsVo) {
+ //选择申请条件条件3时，获得选中产品集合
if("3".equals(fenXiaoSettingVo.getParamValue())) {
String paramValue1 = fenXiaoSettingVo.getParamValue1();
if(StrUtil.isNotEmpty(paramValue1)) {
@@ -96,9 +101,6 @@
}
}
}
-
-
-
return result;
}
--
Gitblit v1.9.1