beauty-erp.git - Gitblit

			@@ -14,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;
			@@ -138,41 +139,47 @@
			public VerificationResult isAbleToBeAnSalesman(String openId,Long companyId) {

			VerificationResult verificationResult=null;
			//申请条件
			BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, companyId);
			switch (applyCondition.getParamValue()){
			case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ:
			verificationResult= VerificationResult.buildVerificationResult(true);
			break;
			case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
			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);
			if(receivedOrderCount>0){
			verificationResult= VerificationResult.buildVerificationResult(true);
			}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){
			verificationResult=VerificationResult.buildVerificationResult(true);
			}else{
			verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！");
			}
			break;
			default:
			verificationResult= VerificationResult.buildVerificationResult(true);

			//申请模式
			BusParameterSettings applyWay = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_WAY, companyId);
			if (applyWay.getParamValue().equals(FenxiaoSettingConstant.FX_APPLY_WAY_AUTO)) {
			verificationResult= VerificationResult.buildVerificationResult(true);
			}else{
			//申请条件
			BusParameterSettings applyCondition = busParameterSettingsDao.selectCompanyParamByCode(FenxiaoSettingConstant.FX_APPLY_CONDITION, companyId);
			switch (applyCondition.getParamValue()){
			case FenxiaoSettingConstant.FX_APPLY_CONDITION_WTJ:
			verificationResult= VerificationResult.buildVerificationResult(true);
			break;
			case FenxiaoSettingConstant.FX_APPLY_CONDITION_XFZDCP:
			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);
			if(receivedOrderCount>0){
			verificationResult= VerificationResult.buildVerificationResult(true);
			}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){
			verificationResult=VerificationResult.buildVerificationResult(true);
			}else{
			verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！");
			}
			break;
			default:
			verificationResult= VerificationResult.buildVerificationResult(true);
			}
			}
			return verificationResult;
			}
			@@ -357,11 +364,9 @@

			@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,8 +379,23 @@
			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);