From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 132 +++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 73 deletions(-)
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 cd840dc..617db32 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
@@ -6,14 +6,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.matrix.biz.bean.BizUser;
-import com.matrix.biz.dao.BizUserDao;
-import com.matrix.biz.service.BizUserService;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.VerificationResult;
-import com.matrix.core.tools.StringUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
@@ -26,6 +22,9 @@
import com.matrix.system.fenxiao.entity.ShopSalesmanGrade;
import com.matrix.system.fenxiao.vo.*;
import com.matrix.system.hive.action.util.QueryUtil;
+import com.matrix.system.hive.bean.SysVipInfo;
+import com.matrix.system.hive.dao.SysVipInfoDao;
+import com.matrix.system.hive.service.SysVipInfoService;
import com.matrix.system.shopXcx.dao.ShopOrderV2Dao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -54,36 +53,36 @@
ShopSalesmanGradeDao shopSalesmanGradeDao;
@Autowired
- BizUserDao bizUserDao;
+ SysVipInfoDao sysVipInfoDao;
@Autowired
- BizUserService bizUserService;
+ SysVipInfoService sysVipInfoService;
@Autowired
ShopOrderV2Dao shopOrderV2Dao;
/**
* 申请成为推广员
- * @param openId
+ * @param userId
* @param invitationId
* @return
*/
- public ShopSalesmanApply applyToBeAnSalesman(String openId,String gradeId,String invitationId,int applyWay) {
+ public ShopSalesmanApply applyToBeAnSalesman(Long userId,Long gradeId,Long invitationId,int applyWay) {
- BizUser loginUser=bizUserDao.findByOpenId(openId);
+ SysVipInfo loginUser=sysVipInfoDao.selectById(userId);
//验证申请条件
- VerificationResult verificationResult = isAbleToBeAnSalesman(openId,loginUser.getCompanyId());
+ VerificationResult verificationResult = isAbleToBeAnSalesman(userId,loginUser.getCompanyId());
if(verificationResult.isJudgeResult()){
//校验审核状态，和是否重复发起
QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id",loginUser.getOpenId());
+ queryWrapper.eq("user_id",loginUser.getId());
queryWrapper.in("apply_status",Arrays.asList("1,2".split(",")));
ShopSalesmanApply checkApply = shopSalesmanApplyDao.selectOne(queryWrapper);
if(checkApply==null||
checkApply.getApplyStatus()==ShopSalesmanApply.APPLY_STATUS_WTG){
ShopSalesmanApply shopSalesmanApply=new ShopSalesmanApply();
- shopSalesmanApply.setUserId(openId);
+ shopSalesmanApply.setUserId(userId);
shopSalesmanApply.setCreateBy(MatrixConstance.SYSTEM_USER);
shopSalesmanApply.setApplyWay(ShopSalesmanApply.APPLY_WAY_SELF);
@@ -94,14 +93,14 @@
shopSalesmanApply.setCreateTime(date);
shopSalesmanApply.setUpdateTime(date);
- if(StringUtils.isNotBlank(invitationId)){
+ if(invitationId!=null){
shopSalesmanApply.setParentUserId(invitationId);
- }else if(StringUtils.isNotBlank(loginUser.getParentOpenId())){
+ }else if(loginUser.getRecommendId()!=null){
//如果曾经是被邀请进来的则自动绑定为之前邀请人的下级
- shopSalesmanApply.setParentUserId(loginUser.getParentOpenId());
+ shopSalesmanApply.setParentUserId(loginUser.getRecommendId());
}
- if(StringUtils.isNotBlank(gradeId)){
- shopSalesmanApply.setGradeId(Long.parseLong(gradeId));
+ if(gradeId!=null){
+ shopSalesmanApply.setGradeId(gradeId);
}else{
//获取初始等级ID（公司id，是否为初始等级）
QueryWrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>();
@@ -122,7 +121,7 @@
queryWrapperOrepool.eq("is_default", 1);
ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectOne(queryWrapperOrepool);
shopSalesmanApply.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_TG);
- bizUserService.setToBeAnSalesman(loginUser.getOpenId(),invitationId,shopSalesmanGrade.getId());
+ sysVipInfoService.setToBeAnSalesman(loginUser.getId(),invitationId,shopSalesmanGrade.getId());
}else{
shopSalesmanApply.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_DSH);
@@ -141,13 +140,13 @@
/**
* 判断是否满足申请成为分销员的条件
*/
- public VerificationResult isAbleToBeAnSalesman(String openId,Long companyId) {
+ public VerificationResult isAbleToBeAnSalesman(Long userId,Long companyId) {
VerificationResult verificationResult=null;
//申请模式
BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, companyId);
- if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {
+ if (FenxiaoSettingConstant.FX_APPLY_WAY_AUTO.equals(applyWay.getParamValue())) {
verificationResult= VerificationResult.buildVerificationResult(true);
}else{
//申请条件
@@ -157,7 +156,7 @@
verificationResult= VerificationResult.buildVerificationResult(true);
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
- int buyZdcpCount= shopOrderV2Dao.countBuyZdcp(openId,applyCondition.getParamValue1());
+ int buyZdcpCount= shopOrderV2Dao.countBuyZdcp(userId,applyCondition.getParamValue1());
if(buyZdcpCount>0){
verificationResult= VerificationResult.buildVerificationResult(true);
}else{
@@ -166,7 +165,7 @@
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFRYCP:
//判断用户是否有确认收货的产品
- int receivedOrderCount= shopOrderV2Dao.selectReceivedOrderCount(openId);
+ int receivedOrderCount= shopOrderV2Dao.selectReceivedOrderCount(userId);
if(receivedOrderCount>0){
verificationResult= VerificationResult.buildVerificationResult(true);
}else{
@@ -175,7 +174,7 @@
break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
Double zdje=Double.parseDouble(applyCondition.getParamValue2());
- Double yxfje=shopOrderV2Dao.countOrderAmount(openId);
+ Double yxfje=shopOrderV2Dao.countOrderAmount(userId);
if(zdje<yxfje){
verificationResult=VerificationResult.buildVerificationResult(true);
}else{
@@ -208,30 +207,30 @@
}
@Transactional(rollbackFor = Exception.class)
- public void addSaleManApply(String userId,String gradeId) {
- BizUser user = bizUserDao.findByOpenId(userId);
- applyToBeAnSalesman(user.getOpenId(),gradeId, "",ShopSalesmanApply.APPLY_WAY_HAND_ADD);
+ public void addSaleManApply(Long userId,Long gradeId) {
+ SysVipInfo user = sysVipInfoDao.selectById(userId);
+ applyToBeAnSalesman(user.getId(),gradeId, null,ShopSalesmanApply.APPLY_WAY_HAND_ADD);
}
@Transactional(rollbackFor = Exception.class)
public void examineSaleManApply(ShopSalesmanApply shopSalesmanApply, Integer applyState) {
- String userId = shopSalesmanApply.getUserId();
- String parentUserId = shopSalesmanApply.getParentUserId();
- BizUser bizUser = bizUserDao.findByOpenId(userId);
+ Long userId = shopSalesmanApply.getUserId();
+ Long parentUserId = shopSalesmanApply.getParentUserId();
+ SysVipInfo sysVipInfo = sysVipInfoDao.selectById(userId);
//修改审核记录
if(ShopSalesmanApply.APPLY_STATUS_TG == applyState) {
shopSalesmanApply.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_TG);
- bizUser.setIsSales(BizUser.IS_SALES);
+ sysVipInfo.setIsSales(SysVipInfo.IS_SALES);
}else {
shopSalesmanApply.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_WTG);
- bizUser.setIsSales(BizUser.NOT_SALES);
+ sysVipInfo.setIsSales(SysVipInfo.NOT_SALES);
}
shopSalesmanApplyDao.updateById(shopSalesmanApply);
//修改USER的状态
- bizUser.setParentOpenId(parentUserId);
- bizUser.setBindingParentTime(new Date());
- bizUser.setSalesmanGrade(shopSalesmanApply.getGradeId());
- bizUserDao.updateByModel(bizUser);
+ sysVipInfo.setRecommendId(parentUserId);
+ sysVipInfo.setBindingParentTime(new Date());
+ sysVipInfo.setSalesmanGrade(shopSalesmanApply.getGradeId());
+ sysVipInfoDao.update(sysVipInfo);
}
public IPage<ShopSalesmanApplyVo> findShopSalesmanDetail(Page<ShopSalesmanApplyVo> page,
@@ -240,11 +239,11 @@
return null;
}
- public SalesmanBasicDetailVo selectShopSalesmanDetailByOpenId(String userId, long applyId) {
+ public SalesmanBasicDetailVo selectShopSalesmanDetailByOpenId(Long userId, long applyId) {
//获取个人信息
- BizUser bizUser = bizUserDao.findByOpenId(userId);
- Long companyId = bizUser.getCompanyId();
- return shopSalesmanApplyDao.selectShopSalesmanDetailByOpenId(userId,companyId,applyId);
+ SysVipInfo sysVipInfo = sysVipInfoDao.selectById(userId);
+ Long companyId = sysVipInfo.getCompanyId();
+ return shopSalesmanApplyDao.selectShopSalesmanDetailByOpenId(sysVipInfo.getId(),companyId,applyId);
}
public IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,LoadParamSettingDto loadParamSettingDto) {
@@ -263,41 +262,36 @@
@Transactional(rollbackFor = Exception.class)
public AjaxResult changeSaleManGrade(ChangeSaleManGradeDto changeSaleManGradeDto) {
- //设置用户公司ID
- QueryUtil.setQueryLimitCom(changeSaleManGradeDto);
- String userId = changeSaleManGradeDto.getUserId();
- Long companyId = changeSaleManGradeDto.getCompanyId();
+
+ SysVipInfo vipInfo = sysVipInfoDao.selectById(changeSaleManGradeDto.getUserId());
+
//获取对应的公司的等级
QueryWrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>();
queryWrapperOrepool.eq("is_default", 1);
- queryWrapperOrepool.eq("company_id", companyId);
+ queryWrapperOrepool.eq("company_id", vipInfo.getCompanyId());
ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectOne(queryWrapperOrepool);
- //修改Biz_User的salesman_grade
- BizUser findByOpenId = bizUserDao.findByOpenId(userId);
- if(ObjectUtil.isEmpty(findByOpenId)) {
- return AjaxResult.buildFailInstance("当前用户已不存在");
- }
+
//不是分销员不允许修改
- Integer isSales = findByOpenId.getIsSales();
- if(BizUser.IS_SALES != isSales) {
+ Integer isSales = vipInfo.getIsSales();
+ if(SysVipInfo.IS_SALES != isSales) {
return AjaxResult.buildFailInstance("当前用户未通过审核，不允许修改");
}
//修改申请记录的等级
QueryWrapper<ShopSalesmanApply> queryShopSalesmanApply = new QueryWrapper<>();
queryShopSalesmanApply.eq("apply_status", 2);
- queryShopSalesmanApply.eq("user_id", userId);
- queryShopSalesmanApply.eq("company_id", companyId);
+ queryShopSalesmanApply.eq("user_id", vipInfo.getId());
+ queryShopSalesmanApply.eq("company_id", vipInfo.getCompanyId());
ShopSalesmanApply shopSalesmanApply = shopSalesmanApplyDao.selectOne(queryShopSalesmanApply);
Long gradeId = changeSaleManGradeDto.getGradeId();
if(ObjectUtil.isEmpty(gradeId)) {
- findByOpenId.setSalesmanGrade(shopSalesmanGrade.getId());
+ vipInfo.setSalesmanGrade(shopSalesmanGrade.getId());
shopSalesmanApply.setGradeId(shopSalesmanGrade.getId());
}else {
- findByOpenId.setSalesmanGrade(gradeId);
+ vipInfo.setSalesmanGrade(gradeId);
shopSalesmanApply.setGradeId(gradeId);
}
- bizUserDao.updateByModel(findByOpenId);
+ sysVipInfoDao.update(vipInfo);
shopSalesmanApplyDao.updateById(shopSalesmanApply);
return AjaxResult.buildSuccessInstance("修改等级成功");
@@ -305,16 +299,9 @@
@Transactional(rollbackFor = Exception.class)
public AjaxResult unbundlingSaleMan(UnbundlingSaleManDto unbundlingSaleManDto) {
- //设置用户公司ID
- QueryUtil.setQueryLimitCom(unbundlingSaleManDto);
- String userId = unbundlingSaleManDto.getUserId();
- //将Biz_User的parent_open_id置空
- BizUser findByOpenId = bizUserDao.findByOpenId(userId);
- if(ObjectUtil.isEmpty(findByOpenId)) {
- return AjaxResult.buildFailInstance("当前用户已不存在");
- }
- findByOpenId.setParentOpenId("");
- bizUserDao.updateByModel(findByOpenId);
+
+ Long userId = unbundlingSaleManDto.getUserId();
+ sysVipInfoDao.unbundlingSaleMan(userId);
return AjaxResult.buildSuccessInstance("解绑成功");
}
@@ -322,18 +309,17 @@
public AjaxResult delSaleManGradeApply(DelSaleManGradeApplyDto delSaleManGradeApplyDto) {
//设置用户公司ID
QueryUtil.setQueryLimitCom(delSaleManGradeApplyDto);
- String userId = delSaleManGradeApplyDto.getUserId();
- Long applyid = delSaleManGradeApplyDto.getApplyId();
+
//将biz_user的is_sale设置成否
- BizUser findByOpenId = bizUserDao.findByOpenId(userId);
- if(ObjectUtil.isEmpty(findByOpenId)) {
+ SysVipInfo vipInfo = sysVipInfoDao.selectById(delSaleManGradeApplyDto.getUserId());
+ if(ObjectUtil.isEmpty(vipInfo)) {
return AjaxResult.buildFailInstance("当前用户已不存在");
}
- findByOpenId.setIsSales(BizUser.NOT_SALES);
- bizUserDao.updateByModel(findByOpenId);
+ vipInfo.setIsSales(SysVipInfo.NOT_SALES);
+ sysVipInfoDao.update(vipInfo);
//将记录设置成系统取消
- ShopSalesmanApply selectById = shopSalesmanApplyDao.selectById(applyid);
+ ShopSalesmanApply selectById = shopSalesmanApplyDao.selectById(delSaleManGradeApplyDto.getApplyId());
selectById.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_XTQX);
shopSalesmanApplyDao.updateById(selectById);
return AjaxResult.buildSuccessInstance("操作成功");
--
Gitblit v1.9.1