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/OrderTask.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
index 0e20288..a8bb1a0 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java
@@ -1,9 +1,6 @@
package com.matrix.system.shopXcx.mqTask;
-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.constance.AppConstance;
@@ -11,13 +8,12 @@
import com.matrix.system.constance.Dictionary;
import com.matrix.system.fenxiao.dao.ShopSalesmanGradeDao;
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.*;
import com.matrix.system.hive.dao.*;
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.ShopSku;
@@ -26,7 +22,6 @@
import com.matrix.system.shopXcx.dao.ShopSkuDao;
import com.rabbitmq.client.DeliverCallback;
import com.rabbitmq.client.Delivery;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -48,7 +43,7 @@
ShopOrderDetailsDao shopOrderDetailsDao;
@Autowired
- BizUserService bizUserService;
+ SysVipInfoService sysVipInfoService;
@Autowired
@@ -103,10 +98,8 @@
}
if(needTb){
- BizUser bizUser = bizUserService.findByOpenId(orderDto.getUserId());
+ SysVipInfo vipInfo = sysVipInfoService.findById(orderDto.getUserId());
SysOrder order = new SysOrder();
- //TODO 根据公司id区分
- SysVipInfo vipInfo = vipDao.selectByPhone(bizUser.getPhoneNumber());
if(SysVipInfo.UNDEAL_VIP==vipInfo.getIsDeal()){
//非成交客户下单更新客户为成交客户
vipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
--
Gitblit v1.9.1