~jiangyouyao/beauty-erp.git

			@@ -71,7 +71,7 @@

			BizUser loginUser=bizUserDao.findByOpenId(openId);
			//验证申请条件
			VerificationResult verificationResult = isAbleToBeAnSalesman(openId);
			VerificationResult verificationResult = isAbleToBeAnSalesman(openId,loginUser.getCompanyId());
			if(verificationResult.isJudgeResult()){
			//校验审核状态，和是否重复发起
			QueryWrapper<ShopSalesmanApply> queryWrapper = new QueryWrapper<>();
			@@ -135,23 +135,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);
			@@ -160,17 +160,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;
			}
			@@ -232,9 +234,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,
			@@ -286,7 +287,7 @@
			bizUserDao.updateByModel(findByOpenId);
			shopSalesmanApplyDao.updateById(shopSalesmanApply);

			return AjaxResult.buildFailInstance("修改等级成功");
			return AjaxResult.buildSuccessInstance("修改等级成功");
			}

			@Transactional(rollbackFor = Exception.class)
			@@ -301,7 +302,7 @@
			}
			findByOpenId.setParentOpenId("");
			bizUserDao.updateByModel(findByOpenId);
			return AjaxResult.buildFailInstance("解绑成功");
			return AjaxResult.buildSuccessInstance("解绑成功");
			}

			@Transactional(rollbackFor = Exception.class)
			@@ -322,7 +323,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) {
			@@ -351,7 +352,7 @@
			return AjaxResult.buildFailInstance("当前行数据不存在，请刷新页面");
			}
			shopSalesmanGradeDao.deleteById(gradeId);
			return AjaxResult.buildFailInstance("操作成功");
			return AjaxResult.buildSuccessInstance("操作成功");
			}

			@Transactional(rollbackFor = Exception.class)
			@@ -381,7 +382,7 @@
			selectById.setInvitationCommission(invitationCommission);
			selectById.setGradeCondition(updateFyfaDto.getGradeCondition());
			shopSalesmanGradeDao.updateById(selectById);
			return AjaxResult.buildFailInstance("操作成功");
			return AjaxResult.buildSuccessInstance("操作成功");
			}

			@Transactional(rollbackFor = Exception.class)
			@@ -393,7 +394,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)
			@@ -405,7 +406,7 @@
			BusParameterSettings busParameterSettings = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_TG_POSTER, companyId);
			busParameterSettings.setParamValue(updateTgtpDto.getImageUrl());
			busParameterSettingsDao.updateByModel(busParameterSettings);
			return AjaxResult.buildFailInstance("保存成功");
			return AjaxResult.buildSuccessInstance("保存成功");
			}