From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式
---
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java | 91 +++++++++++++++++++++++----------------------
1 files changed, 46 insertions(+), 45 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..26957ad 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
@@ -4,11 +4,8 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.matrix.biz.bean.BizUser;
-import com.matrix.biz.service.BizUserService;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.tools.LogUtil;
-import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant;
@@ -16,12 +13,14 @@
import com.matrix.system.fenxiao.dao.ShopSalesmanOrderDao;
import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
import com.matrix.system.fenxiao.entity.ShopSalesmanOrder;
+import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.ShoppingGoodsService;
import com.matrix.system.hive.service.SysOrderService;
+import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.shopXcx.bean.ShopOrder;
import com.matrix.system.shopXcx.bean.ShopOrderDetails;
import com.matrix.system.shopXcx.bean.ShopProduct;
@@ -52,7 +51,7 @@
ShopOrderDetailsDao shopOrderDetailsDao;
@Autowired
- BizUserService bizUserService;
+ SysVipInfoService sysVipInfoService;
@Autowired
@@ -113,8 +112,8 @@
@Transactional
void handleExtensionOrder(ShopOrder order) {
//判读客户是否存在上级，存在则产生上级的收益
- BizUser bizUser = bizUserService.findByOpenId(order.getUserId());
- LogUtil.debug("处理分销订单userOpid={}",bizUser.getOpenId());
+ SysVipInfo sysVipInfo = sysVipInfoService.findById(order.getUserId());
+ LogUtil.debug("处理分销订单userOpid={}",sysVipInfo.getOpenId());
//判断是否重复生成
QueryWrapper queryWrapper=new QueryWrapper();
queryWrapper.eq("order_id",order.getId());
@@ -128,7 +127,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;
@@ -136,62 +134,64 @@
//分销订单总额
Double orderTotal=0D;
for (ShopOrderDetails item:order.getDetails() ){
- if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
- && item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
+ if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
orderTotal+=item.getTotalPrice().doubleValue();
}
}
//自购返佣
- for (ShopOrderDetails item:order.getDetails() ){
- if(StringUtils.isNotBlank(item.getShopProduct().getAttrValues())
- && item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
- //分销规则是否开启自购返佣
- BusParameterSettings zgfy = parameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_ZGFY, bizUser.getCompanyId());
- //按分销等级计算
- ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(bizUser.getSalesmanGrade());
- if(ObjectUtil.isNotEmpty(zgfy)) {
- //获取商品的自购返佣价格,如果没有设置，在去获取当前推广人的等级的自购返佣比例
- if(StrUtil.isNotEmpty(zgfy.getParamValue()) &&
- FenxiaoSettingConstant.FX_ZGFY_YES.equals(zgfy.getParamValue())) {
- if(item.getShopSku().getSelfPrice() == null
- ||item.getShopSku().getSealesPrice().doubleValue() == 0){
- selfAmount+=item.getTotalPrice().doubleValue()*(shopSalesmanGrade.getSelfCommission()/100);
- }else {
- //按产品设置的自购返佣金额计算
- selfAmount+=item.getShopSku().getSelfPrice().doubleValue()*item.getCount();
- }
- }
+ Integer isSales = sysVipInfo.getIsSales();
+ if(SysVipInfo.IS_SALES == isSales){
+ for (ShopOrderDetails item:order.getDetails() ){
+ if(item.getShopProduct().getAbleSales()==ShopProduct.ABLE_SALES){
+ //分销规则是否开启自购返佣
+ BusParameterSettings zgfy = parameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_ZGFY, sysVipInfo.getCompanyId());
+ //按分销等级计算
+ ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectById(sysVipInfo.getSalesmanGrade());
+ if(ObjectUtil.isNotEmpty(zgfy)) {
+ //获取商品的自购返佣价格,如果没有设置，在去获取当前推广人的等级的自购返佣比例
+ if(StrUtil.isNotEmpty(zgfy.getParamValue()) &&
+ FenxiaoSettingConstant.FX_ZGFY_YES.equals(zgfy.getParamValue())) {
+ if(item.getShopSku().getSelfPrice() == null
+ ||item.getShopSku().getSealesPrice().doubleValue() == 0){
+ selfAmount+=item.getTotalPrice().doubleValue()*(shopSalesmanGrade.getSelfCommission()/100);
+ }else {
+ //按产品设置的自购返佣金额计算
+ selfAmount+=item.getShopSku().getSelfPrice().doubleValue()*item.getCount();
+ }
+ }
+ }
}
}
+ //自购返佣记录
+ if(selfAmount > 0) {
+ //整体的优惠金额折算成折扣，* 佣金
+ zk=order.getOrderMoney().doubleValue()/orderTotal;
+ selfAmount=selfAmount*zk;
+ salesmanOrder.setAmount(selfAmount);
+ salesmanOrder.setSalesUserId(order.getUserId());
+ shopSalesmanOrderDao.insert(salesmanOrder);
+ }
}
- //自购返佣记录
- if(selfAmount > 0) {
- //整体的优惠金额折算成折扣，* 佣金
- zk=order.getOrderMoney().doubleValue()/orderTotal;
- selfAmount=selfAmount*zk;
- salesmanOrder.setAmount(selfAmount);
- shopSalesmanOrderDao.insert(salesmanOrder);
- }
+
//存在上级
- if(StringUtils.isNotBlank(bizUser.getParentOpenId())) {
- BizUser salesMan=bizUserService.findByOpenId(bizUser.getParentOpenId());
+ if(sysVipInfo.getRecommendId()!=null) {
+ SysVipInfo salesMan=sysVipInfoService.findById(sysVipInfo.getRecommendId());
Double salesAmount=0D;
Double invitationAmount=0D;
- BizUser invitationMan=null;
+ SysVipInfo invitationMan=null;
ShopSalesmanOrder invitationOrder=null;
- boolean hasInvitationMan=StringUtils.isNotBlank(salesMan.getParentOpenId());
+ boolean hasInvitationMan=salesMan.getRecommendId()!=null;
//判断推广员是否还存在上级,存在则计算邀请收益
if(hasInvitationMan){
- invitationMan=bizUserService.findByOpenId(salesMan.getParentOpenId());
+ invitationMan=sysVipInfoService.findById(salesMan.getRecommendId());
invitationOrder=new ShopSalesmanOrder();
BeanUtils.copyProperties(salesmanOrder,invitationOrder);
- invitationOrder.setSalesUserId(invitationMan.getOpenId());
+ invitationOrder.setSalesUserId(invitationMan.getId());
invitationOrder.setRevenueType(ShopSalesmanOrder.REVENUE_TYPE_INVITATION);
}
//收益计算
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 +221,7 @@
zk=order.getOrderMoney().doubleValue()/orderTotal;
salesAmount=salesAmount*zk;
salesmanOrder.setAmount(salesAmount);
+ salesmanOrder.setSalesUserId(sysVipInfo.getRecommendId());
shopSalesmanOrderDao.insert(salesmanOrder);
}
//邀请提成记录
@@ -231,7 +232,7 @@
shopSalesmanOrderDao.insert(invitationOrder);
}
}else{
- LogUtil.debug("不存在父级userOpid={}",bizUser.getOpenId());
+ LogUtil.debug("不存在父级userOpid={}",sysVipInfo.getOpenId());
}
}else{
LogUtil.debug("重复订单id={}",order.getId());
--
Gitblit v1.9.1