From 51b1242dc2f55276b65f287974e7f86dcab8c74d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:56:27 +0800
Subject: [PATCH] 修改商品查询bug1
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 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..98e2f77 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,8 @@
package com.matrix.system.fenxiao.action;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.matrix.biz.dao.BizUserDao;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.tools.WebUtil;
@@ -9,25 +12,15 @@
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
import com.matrix.system.fenxiao.service.FenXiaoSettingService;
import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;
+import com.matrix.system.hive.bean.ShoppingGoods;
+import com.matrix.system.hive.dao.ShoppingGoodsDao;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
-import com.matrix.system.hive.bean.ShoppingGoods;
-import com.matrix.system.hive.dao.ShoppingGoodsDao;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping(value = "/fenXiao/ruleSetting")
@@ -41,6 +34,9 @@
@Autowired
private ShoppingGoodsDao shoppingGoodsDao;
+
+ @Autowired
+ private BizUserDao bizUserDao;
/**
*查询分销配置
@@ -79,7 +75,8 @@
result.putInMap("sqtj", sqtjRuleSettingsVo);
if(CollUtil.isNotEmpty(sqtjRuleSettingsVo)){
for(FenXiaoSettingVo fenXiaoSettingVo : sqtjRuleSettingsVo) {
- if("3".equals(fenXiaoSettingVo.getParamValue())) {
+ //选择申请条件条件3时，获得选中产品集合
+ if(FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP.equals(fenXiaoSettingVo.getParamValue())) {
String paramValue1 = fenXiaoSettingVo.getParamValue1();
if(StrUtil.isNotEmpty(paramValue1)) {
List<Integer> idsList = new ArrayList<>();
@@ -96,9 +93,6 @@
}
}
}
-
-
-
return result;
}
--
Gitblit v1.9.1