From c04ce1ba66b14135c92d6bf79450f78361a29336 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Mar 2021 17:12:15 +0800
Subject: [PATCH] 分销设置自购返佣
---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 7 ++++++-
zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java | 4 ++--
zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java b/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java
index 7aa2b0f..be36239 100644
--- a/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java
+++ b/zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java
@@ -78,5 +78,5 @@
* 设置为推广员
* @param invitationId
*/
- public int setToBeAnSalesman(String openId,String invitationId);
+ public int setToBeAnSalesman(String openId,String invitationId,long gradeId);
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java b/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java
index f2d62d6..7e24950 100644
--- a/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java
@@ -8,7 +8,6 @@
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.ModelUtils;
-import com.matrix.core.tools.UUIDUtil;
import com.matrix.system.common.constance.AppConstance;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -158,11 +157,12 @@
* @param invitationId
*/
@Override
- public int setToBeAnSalesman(String openId,String invitationId) {
+ public int setToBeAnSalesman(String openId,String invitationId,long gradeId) {
BizUser bizUser=bizUserDao.findByOpenId(openId);
bizUser.setIsSales(BizUser.IS_SALES);
bizUser.setParentOpenId(invitationId);
bizUser.setBindingParentTime(new Date());
+ bizUser.setSalesmanGrade(gradeId);
return bizUserDao.updateByModel(bizUser);
}
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
index 6e0e965..cd840dc 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -116,8 +116,13 @@
if(busParameterSettings!=null
&&busParameterSettings.getParamValue().equals("1")){
//自动审核
+ //初始等级ID（公司id，是否为初始等级）
+ QueryWrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>();
+ queryWrapperOrepool.eq("company_id", loginUser.getCompanyId());
+ queryWrapperOrepool.eq("is_default", 1);
+ ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectOne(queryWrapperOrepool);
shopSalesmanApply.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_TG);
- bizUserService.setToBeAnSalesman(loginUser.getOpenId(),invitationId);
+ bizUserService.setToBeAnSalesman(loginUser.getOpenId(),invitationId,shopSalesmanGrade.getId());
}else{
shopSalesmanApply.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_DSH);
--
Gitblit v1.9.1