From d1bb177d31edc15dba595d6a14dadfd73f99e7a7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Mar 2021 11:28:43 +0800
Subject: [PATCH] 分销设置自购返佣
---
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 ac4ce8b..1252651 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
@@ -15,11 +15,9 @@
import com.matrix.system.fenxiao.service.FenXiaoSettingService;
import com.matrix.system.fenxiao.vo.FenXiaoSettingVo;
import com.matrix.system.hive.action.util.QueryUtil;
-import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.shopXcx.bean.ShopProduct;
import com.matrix.system.shopXcx.dao.ShopProductDao;
-
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -62,6 +60,12 @@
String[] FXKGName={"分销开关"};
List<FenXiaoSettingVo> fxkgRuleSettingsVo = getRuleSettingsVo(FXKGCode,FXKGName,companyId);
result.putInMap("fxkg", fxkgRuleSettingsVo);
+ //自购返佣
+ String[] ZGFYCode={FenxiaoSettingConstant.FX_ZGFY};
+ String[] ZGFYName={"自购返佣"};
+ List<FenXiaoSettingVo> zgfyRuleSettingsVo = getRuleSettingsVo(ZGFYCode,ZGFYName,companyId);
+ result.putInMap("zgfy", zgfyRuleSettingsVo);
+
//分销模式
String[] FXMSCode={FenxiaoSettingConstant.FX_MODEL};
String[] FXMSName={"分销模式"};
@@ -96,10 +100,14 @@
idsList.add(parseInt);
}
}
- List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);
- result.putInMap("order", list);
+ //List<ShoppingGoods> list = shoppingGoodsDao.selectByIds(idsList);
+ List<ShopProduct> shopProducts = shopProductDao.selectByIds(idsList);
+ result.putInMap("order", shopProducts);
}
- }
+ }else{
+ List<ShopProduct> shopProducts = new ArrayList<>();
+ result.putInMap("order", shopProducts);
+ }
}
}
return result;
--
Gitblit v1.9.1