From 0c60f5608fc8f738eb138e32f583c329ed5aa81d Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 17 Mar 2021 14:46:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 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 2a743c2..e1aca9d 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
@@ -142,10 +142,9 @@
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);
@@ -170,10 +169,9 @@
}else{
verificationResult= VerificationResult.buildVerificationResult(false,"不符合申请条件，请消费满"+zdje+"元后再申请！");
}
- VerificationResult.buildVerificationResult(true);
break;
default:
- VerificationResult.buildVerificationResult(true);
+ verificationResult= VerificationResult.buildVerificationResult(true);
}
return verificationResult;
@@ -236,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,
@@ -290,7 +287,7 @@
bizUserDao.updateByModel(findByOpenId);
shopSalesmanApplyDao.updateById(shopSalesmanApply);
- return AjaxResult.buildFailInstance("修改等级成功");
+ return AjaxResult.buildSuccessInstance("修改等级成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -305,7 +302,7 @@
}
findByOpenId.setParentOpenId("");
bizUserDao.updateByModel(findByOpenId);
- return AjaxResult.buildFailInstance("解绑成功");
+ return AjaxResult.buildSuccessInstance("解绑成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -326,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) {
@@ -355,7 +352,7 @@
return AjaxResult.buildFailInstance("当前行数据不存在，请刷新页面");
}
shopSalesmanGradeDao.deleteById(gradeId);
- return AjaxResult.buildFailInstance("操作成功");
+ return AjaxResult.buildSuccessInstance("操作成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -385,7 +382,7 @@
selectById.setInvitationCommission(invitationCommission);
selectById.setGradeCondition(updateFyfaDto.getGradeCondition());
shopSalesmanGradeDao.updateById(selectById);
- return AjaxResult.buildFailInstance("操作成功");
+ return AjaxResult.buildSuccessInstance("操作成功");
}
@Transactional(rollbackFor = Exception.class)
@@ -397,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)
@@ -409,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("保存成功");
}
--
Gitblit v1.9.1