From a6e7be2c2273b0569f57965c5fbd3ffb1c4fb8a4 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 18:49:11 +0800
Subject: [PATCH] 修改bug
---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 74 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 30 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 786bf40..3acf923 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
@@ -2,7 +2,6 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,6 +14,7 @@
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;
import com.matrix.system.common.dao.BusParameterSettingsDao;
@@ -72,7 +72,7 @@
BizUser loginUser=bizUserDao.findByOpenId(openId);
//验证申请条件
- VerificationResult verificationResult = isAbleToBeAnSalesman(openId);
+ VerificationResult verificationResult = isAbleToBeAnSalesman(openId,loginUser.getCompanyId());
if(verificationResult.isJudgeResult()){
//校验审核状态，和是否重复发起
QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();
@@ -104,9 +104,9 @@
shopSalesmanApply.setGradeId(Long.parseLong(gradeId));
}else{
//获取初始等级ID（公司id，是否为初始等级）
- Wrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>();
- ((QueryWrapper<ShopSalesmanGrade>) queryWrapperOrepool).eq("company_id", loginUser.getCompanyId());
- ((QueryWrapper<ShopSalesmanGrade>) queryWrapperOrepool).eq("is_default", 1);
+ QueryWrapper<ShopSalesmanGrade> queryWrapperOrepool = new QueryWrapper<>();
+ queryWrapperOrepool.eq("company_id", loginUser.getCompanyId());
+ queryWrapperOrepool.eq("is_default", 1);
ShopSalesmanGrade shopSalesmanGrade = shopSalesmanGradeDao.selectOne(queryWrapperOrepool);
shopSalesmanApply.setGradeId(shopSalesmanGrade.getId());
}
@@ -136,23 +136,23 @@
/**
* 判断是否满足申请成为分销员的条件
*/
- public VerificationResult isAbleToBeAnSalesman(String openId) {
- BizUser bizUser = bizUserDao.findByOpenId(openId);
+ public VerificationResult isAbleToBeAnSalesman(String openId,Long companyId) {
+
VerificationResult verificationResult=null;
//申请条件
- BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, bizUser.getCompanyId());
+ BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, companyId);
switch (applyCondition.getParamValue()){
case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ:
- VerificationResult.buildVerificationResult(true);
+ verificationResult= VerificationResult.buildVerificationResult(true);
+ break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
- VerificationResult.buildVerificationResult(true);
int buyZdcpCount= shopOrderV2Dao.countBuyZdcp(openId,applyCondition.getParamValue1());
if(buyZdcpCount>0){
verificationResult= VerificationResult.buildVerificationResult(true);
}else{
verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费指定产品后再申请！");
}
-
+ break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFRYCP:
//判断用户是否有确认收货的产品
int receivedOrderCount= shopOrderV2Dao.selectReceivedOrderCount(openId);
@@ -161,17 +161,19 @@
}else{
verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费任意产品后再申请！");
}
+ break;
case FenxiaoSettingConstant.FX_APPLY_CONDITION_XCZDJE:
Double zdje=Double.parseDouble(applyCondition.getParamValue2());
Double yxfje=shopOrderV2Dao.countOrderAmount(openId);
- if(zdje>yxfje){
+ if(zdje<yxfje){
verificationResult=VerificationResult.buildVerificationResult(true);
}else{
verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！");
}
- VerificationResult.buildVerificationResult(true);
+ break;
default:
- VerificationResult.buildVerificationResult(true);
+ verificationResult= VerificationResult.buildVerificationResult(true);
+
}
return verificationResult;
}
@@ -233,9 +235,8 @@
return shopSalesmanApplyDao.selectShopSalesmanDetailByOpenId(userId,companyId,applyId);
}
- public IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,
- ShopSalesmanDetailDto shopSalesmanDetailDto) {
- return shopSalesmanApplyDao.findCustomDetail(page,shopSalesmanDetailDto);
+ public IPage<ShopCustomDetailVo> findCustomDetail(Page<ShopCustomDetailVo> page,LoadParamSettingDto loadParamSettingDto) {
+ return shopSalesmanApplyDao.findCustomDetail(page,loadParamSettingDto);
}
public IPage<ShopCustomDetailVo> findCustomLow(Page<ShopCustomDetailVo> pageLow,
@@ -287,7 +288,7 @@
bizUserDao.updateByModel(findByOpenId);
shopSalesmanApplyDao.updateById(shopSalesmanApply);
- return AjaxResult.buildFailInstance("修改等级成功");
+ return AjaxResult.buildSuccessInstance("修改等级成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -302,7 +303,7 @@
}
findByOpenId.setParentOpenId("");
bizUserDao.updateByModel(findByOpenId);
- return AjaxResult.buildFailInstance("解绑成功");
+ return AjaxResult.buildSuccessInstance("解绑成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -323,7 +324,7 @@
ShopSalesmanApply selectById = shopSalesmanApplyDao.selectById(applyid);
selectById.setApplyStatus(ShopSalesmanApply.APPLY_STATUS_XTQX);
shopSalesmanApplyDao.updateById(selectById);
- return AjaxResult.buildFailInstance("操作成功");
+ return AjaxResult.buildSuccessInstance("操作成功");
}
public IPage<FyfaManageVo> findFyfaManageList(Page<FyfaManageVo> page, FyfaManageDto fyfaManageDto) {
@@ -352,16 +353,14 @@
return AjaxResult.buildFailInstance("当前行数据不存在，请刷新页面");
}
shopSalesmanGradeDao.deleteById(gradeId);
- return AjaxResult.buildFailInstance("操作成功");
+ return AjaxResult.buildSuccessInstance("操作成功");
}
@Transactional(rollbackFor = Exception.class)
public AjaxResult updateFyfa(UpdateFyfaDto updateFyfaDto) {
-
+ //设置用户公司ID
+ QueryUtil.setQueryLimitCom(updateFyfaDto);
ShopSalesmanGrade selectById = shopSalesmanGradeDao.selectById(updateFyfaDto.getId());
- if(ObjectUtil.isEmpty(selectById)) {
- return AjaxResult.buildFailInstance("当前行数据不存在，请刷新页面");
- }
String name = updateFyfaDto.getName();
if(StrUtil.isEmpty(name)) {
return AjaxResult.buildFailInstance("请输入方案名称");
@@ -374,15 +373,30 @@
if(ObjectUtil.isEmpty(invitationCommission)) {
return AjaxResult.buildFailInstance("请输入正确的邀请提成");
}
- //设置用户公司ID
- QueryUtil.setQueryLimitCom(updateFyfaDto);
+ if(ObjectUtil.isEmpty(selectById)) {
+ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+ ShopSalesmanGrade shopSalesmanGrade = new ShopSalesmanGrade();
+ shopSalesmanGrade.setCompanyId(updateFyfaDto.getCompanyId());
+ shopSalesmanGrade.setName(updateFyfaDto.getName());
+ shopSalesmanGrade.setSealesCommission(sealesCommission);
+ shopSalesmanGrade.setInvitationCommission(invitationCommission);
+ shopSalesmanGrade.setGradeCondition(updateFyfaDto.getGradeCondition());
+ shopSalesmanGrade.setIsDefault(2);
+ shopSalesmanGrade.setCreateBy(user.getSuName());
+ shopSalesmanGrade.setUpdateBy(user.getSuName());
+ shopSalesmanGrade.setCreateTime(new Date());
+ shopSalesmanGrade.setUpdateTime(new Date());
+ shopSalesmanGrade.setCompanyId(user.getCompanyId());
+ shopSalesmanGradeDao.insert(shopSalesmanGrade);
+ return AjaxResult.buildSuccessInstance("操作成功");
+ }
selectById.setCompanyId(updateFyfaDto.getCompanyId());
selectById.setName(updateFyfaDto.getName());
selectById.setSealesCommission(sealesCommission);
selectById.setInvitationCommission(invitationCommission);
selectById.setGradeCondition(updateFyfaDto.getGradeCondition());
shopSalesmanGradeDao.updateById(selectById);
- return AjaxResult.buildFailInstance("操作成功");
+ return AjaxResult.buildSuccessInstance("操作成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -394,7 +408,7 @@
BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_PLAN, companyId);
busParameterSettings.setParamValue3(updateTgjhDto.getTgfa());
busParameterSettingsDao.updateByModel(busParameterSettings);
- return AjaxResult.buildFailInstance("保存成功");
+ return AjaxResult.buildSuccessInstance("保存成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -406,7 +420,7 @@
BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_POSTER, companyId);
busParameterSettings.setParamValue(updateTgtpDto.getImageUrl());
busParameterSettingsDao.updateByModel(busParameterSettings);
- return AjaxResult.buildFailInstance("保存成功");
+ return AjaxResult.buildSuccessInstance("保存成功");
}
--
Gitblit v1.9.1