From 5857fd14f4608ace25724ba6386d72d210e20870 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 25 Mar 2021 10:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 0ce73e1..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
@@ -128,7 +128,6 @@
salesmanOrder.setUpdateTime(new Date());
salesmanOrder.setOrderId(Long.parseLong(order.getId()+""));
salesmanOrder.setUserId(order.getUserId());
- salesmanOrder.setSalesUserId(bizUser.getParentOpenId());
salesmanOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_SALES);
salesmanOrder.setOrderStatus(ShopSalesmanOrder.STATUS_DJS);
Double selfAmount=0D;
@@ -143,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());
//按分销等级计算
@@ -170,6 +168,7 @@
zk=order.getOrderMoney().doubleValue()/orderTotal;
selfAmount=selfAmount*zk;
salesmanOrder.setAmount(selfAmount);
+ salesmanOrder.setSalesUserId(order.getUserId());
shopSalesmanOrderDao.insert(salesmanOrder);
}
//存在上级
@@ -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());
//推广提成，按分销等级计算或者按产品设置的推广金额计算
@@ -221,6 +219,7 @@
zk=order.getOrderMoney().doubleValue()/orderTotal;
salesAmount=salesAmount*zk;
salesmanOrder.setAmount(salesAmount);
+ salesmanOrder.setSalesUserId(bizUser.getParentOpenId());
shopSalesmanOrderDao.insert(salesmanOrder);
}
//邀请提成记录
--
Gitblit v1.9.1