From ed7b3467069bf870911f57f94f34eeb67b3616a2 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 5 Mar 2024 09:11:51 +0800 Subject: [PATCH] bug --- fuintAdmin/src/views/userGrade/index.vue | 38 ++++++++++--------- .../src/views/components/Service/staff.vue | 1 + .../member/controller/LJStaffController.java | 2 +- .../member/service/ILJStaffService.java | 2 +- .../service/impl/LJStaffServiceImpl.java | 31 +++++++++------ .../impl/MtUserGradeChildServiceImpl.java | 22 ++++++----- .../role/service/impl/DutyServiceImpl.java | 3 ++ 7 files changed, 58 insertions(+), 41 deletions(-) diff --git a/fuintAdmin/src/views/userGrade/index.vue b/fuintAdmin/src/views/userGrade/index.vue index 8c26451d7..1f64ffec2 100644 --- a/fuintAdmin/src/views/userGrade/index.vue +++ b/fuintAdmin/src/views/userGrade/index.vue @@ -1018,23 +1018,25 @@ export default { // 是否开启等级功能 getISEnableLevel(){ getChainStoreConfig().then(response => { - this.isEnableLevel = response.data.isEnableLevel; - this.clear = response.data.isMonthClear; - if (response.data.gasGrowthValue){ - this.gasGrowthValue = response.data.gasGrowthValue; - } - if (response.data.dieselGrowthValue) { - this.dieselGrowthValue = response.data.dieselGrowthValue; - } - if (response.data.naturalGrowthValue) { - this.naturalGrowthValue = response.data.naturalGrowthValue; - } - if (response.data.isEnableLevel=="no"){ - this.level1 = true; - this.level2 = false; - }else { - this.level1 = false; - this.level2 = true; + if (response.data) { + this.isEnableLevel = response.data.isEnableLevel; + this.clear = response.data.isMonthClear; + if (response.data.gasGrowthValue) { + this.gasGrowthValue = response.data.gasGrowthValue; + } + if (response.data.dieselGrowthValue) { + this.dieselGrowthValue = response.data.dieselGrowthValue; + } + if (response.data.naturalGrowthValue) { + this.naturalGrowthValue = response.data.naturalGrowthValue; + } + if (response.data.isEnableLevel == "no") { + this.level1 = true; + this.level2 = false; + } else { + this.level1 = false; + this.level2 = true; + } } }) // getSysConfig('is_enable_level').then(response => { @@ -1116,7 +1118,7 @@ export default { // 查询连锁店配置信息 getClearConfig(){ getChainStoreConfig().then(response => { - this.clear = response.data.levelClearRule; + if (response.data) this.clear = response.data.levelClearRule; }) }, // 修改清算规则 diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue index ee7c38b69..d11095d3c 100644 --- a/fuintAdmin_zt/src/views/components/Service/staff.vue +++ b/fuintAdmin_zt/src/views/components/Service/staff.vue @@ -489,6 +489,7 @@ this.$refs["form"].validate(valid => { if (valid) { if (!this.form.id) { + this.form.storeId = this.id; this.form.posPrem = JSON.stringify(this.form.posPrem); this.form.appletPrem = JSON.stringify(this.form.appletPrem); addStaff(this.form).then(response => { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java index 63ac5552e..c2e167f5a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java @@ -117,7 +117,7 @@ public class LJStaffController extends BaseController { @PostMapping("/mobile") public ResponseObject staffByMobile(@Validated @RequestBody Map map){ String mobile = map.get("mobile"); - LJStaff staff = mtStaffService.selectStaffByMobile(mobile); + LJStaff staff = mtStaffService.selectStaffByMobile(mobile,null); return getSuccessResult(staff); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java index f1eb87a4a..7f4eb13df 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java @@ -54,7 +54,7 @@ public interface ILJStaffService extends IService { * @param mobile * @return */ - public LJStaff selectStaffByMobile(String mobile); + public LJStaff selectStaffByMobile(String mobile,Integer storeId); public LJStaff selectStaffByMobile2(String mobile); /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java index f6366f9ae..373dab7dc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java @@ -19,6 +19,8 @@ import com.fuint.common.util.TokenUtil; import com.fuint.framework.web.ResponseObject; import com.fuint.module.backendApi.controller.BackendFileController; import com.fuint.repository.model.TAccount; +import com.fuint.system.role.entity.TDuty; +import com.fuint.system.role.service.DutyService; import com.fuint.utils.Digests; import com.fuint.utils.Encodes; import jdk.nashorn.internal.parser.Token; @@ -28,6 +30,7 @@ import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.*; import java.text.SimpleDateFormat; @@ -45,6 +48,8 @@ public class LJStaffServiceImpl extends ServiceImpl impl private AccountService accountService; @Autowired private QrCodeUtils qrCodeUtils; + @Resource + private DutyService tDutyService; /** * 根据条件分页查询员工信息 @@ -126,11 +131,14 @@ public class LJStaffServiceImpl extends ServiceImpl impl * @return */ @Override - public LJStaff selectStaffByMobile(String mobile) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + public LJStaff selectStaffByMobile(String mobile,Integer storeId) { + if (ObjectUtil.isEmpty(storeId)){ + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + storeId = nowAccountInfo.getStoreId(); + } QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("mobile",mobile); - queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); + queryWrapper.eq("store_id",storeId); queryWrapper.eq("if_delete","0"); LJStaff staff = baseMapper.selectOne(queryWrapper); return staff; @@ -176,19 +184,19 @@ public class LJStaffServiceImpl extends ServiceImpl impl */ @Override public int insertStaff(LJStaff staff) { - LJStaff staff2 = this.selectStaffByMobile(staff.getMobile()); - if (ObjectUtil.isNotEmpty(staff2)) return 0; AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); Integer storeId = nowAccountInfo.getStoreId(); if (ObjectUtil.isNotEmpty(staff.getStoreId())) { storeId = staff.getStoreId(); } + LJStaff staff2 = this.selectStaffByMobile(staff.getMobile(),storeId); + if (ObjectUtil.isNotEmpty(staff2)) return 0; staff.setStoreId(storeId); if (StringUtils.isNotEmpty(staff.getRefundPassword())){ this.entryptPassword(staff); } int row = baseMapper.insert(staff); - LJStaff staff1 = this.selectStaffByMobile(staff.getMobile()); + LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),storeId); if (ObjectUtil.isNotEmpty(staff1)){ // 添加员工码 staff1.setStaffCode("https://www.tuofeng.cc/oilRefuel?storeId="+storeId+"&staffId="+staff1.getId()); @@ -221,15 +229,16 @@ public class LJStaffServiceImpl extends ServiceImpl impl }else { account.setPassword("123456"); } - - accountService.createAccountInfo(account,null); + TDuty tDuty = new TDuty(); + tDuty.setDutyId(Integer.valueOf(staff1.getRoleId())); + accountService.createAccountInfo(account,tDutyService.getDutyList(tDuty)); return row; } @Override public int addStaff(LJStaff staff,TAccount tAccount) { int row = baseMapper.insert(staff); - LJStaff staff1 = this.selectStaffByMobile(staff.getMobile()); + LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),null); if (ObjectUtil.isNotEmpty(staff1)){ tAccount.setStaffId(staff1.getId()); accountService.updateAccount(tAccount); @@ -245,8 +254,8 @@ public class LJStaffServiceImpl extends ServiceImpl impl @Override public int updateStaff(LJStaff staff) { int row = 0; - LJStaff staff1 = this.selectStaffByMobile(staff.getMobile()); - if (ObjectUtil.isNotEmpty(staff1) && staff1.getId() != staff.getId()){ + LJStaff staff1 = this.selectStaffByMobile(staff.getMobile(),staff.getStoreId()); + if (ObjectUtil.isNotEmpty(staff1) && !staff1.getId().equals(staff.getId())){ row = 0; return row; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserGradeChildServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserGradeChildServiceImpl.java index 9542a2a8e..f35cbbb6b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserGradeChildServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/MtUserGradeChildServiceImpl.java @@ -48,17 +48,19 @@ public class MtUserGradeChildServiceImpl extends ServiceImpl(); + if (ObjectUtil.isNotEmpty(chainStoreConfig)) { + String isEnableLevel = chainStoreConfig.getIsEnableLevel(); + if (isEnableLevel.equals("yes")) { + if (ObjectUtil.isNotEmpty(userVo.getGradeId())) { + LJUserGrade ljUserGrade = ljUserGradeService.selectUserGradeById(userVo.getGradeId()); + if (!ljUserGrade.getIfRechargeCoupon().equals("1")) { + return new ArrayList(); + } + } else { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_grade_id", userVo.getGradeId()); + return baseMapper.selectList(queryWrapper); } - }else{ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_grade_id",userVo.getGradeId()); - return baseMapper.selectList(queryWrapper); } } return new ArrayList(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java index e53aabba4..7e903f9bd 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/service/impl/DutyServiceImpl.java @@ -285,6 +285,9 @@ public class DutyServiceImpl extends ServiceImpl implements if (ObjectUtil.isNotEmpty(tDuty) && ObjectUtil.isNotEmpty(tDuty.getPermissionType())) { lambdaQueryWrapper.like(TDuty::getPermissionType,tDuty.getPermissionType()); } + if (ObjectUtil.isNotEmpty(tDuty) && ObjectUtil.isNotEmpty(tDuty.getDutyId())) { + lambdaQueryWrapper.eq(TDuty::getDutyId,tDuty.getDutyId()); + } return baseMapper.selectList(lambdaQueryWrapper); }