From 1ca30318231615ca0a4f2322f1c851f04fefeb73 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Mar 2021 18:37:15 +0800
Subject: [PATCH] 分销设置自购返佣
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java
index 5617616..1e029f8 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java
@@ -142,8 +142,7 @@
}
//自购返佣
for (ShopOrderDetails item:order.getDetails() ){
- if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
- && item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
+ if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
//分销规则是否开启自购返佣
BusParameterSettings zgfy = parameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_ZGFY, bizUser.getCompanyId());
//按分销等级计算
@@ -190,8 +189,7 @@
}
//收益计算
for (ShopOrderDetails item:order.getDetails() ){
- if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
- && item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
+ if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
//按分销等级计算
ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(salesMan.getSalesmanGrade());
//推广提成，按分销等级计算或者按产品设置的推广金额计算
--
Gitblit v1.9.1