From e364fad6456ead769c5ad8768f6535100fbc94d5 Mon Sep 17 00:00:00 2001 From: hejiayang <296714699@qq.com> Date: Thu, 11 Dec 2025 17:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=89=B4=E6=9D=83=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=201.=20=E6=B5=81=E6=B0=B4=E6=98=8E=E7=BB=86=202.=20?= =?UTF-8?q?=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95=203.=20=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=BB=9F=E8=AE=A1=204.=20=E9=A3=9F=E5=A0=82?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StBbzxOrderInfoController.java | 80 +++++++++---------- .../StClientMemberBalanceController.java | 66 +++++++-------- .../impl/StBbzxOrderInfoServiceImpl.java | 48 +++++------ .../StBaseRestaurantDeptController.java | 12 +-- 4 files changed, 104 insertions(+), 102 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java index d8ccdb3..5f44436 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StBbzxOrderInfoController.java @@ -294,18 +294,18 @@ public class StBbzxOrderInfoController { } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //餐品总库只查询内置食堂 - if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ - // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -// ScreenVo screenVo = new ScreenVo(); -// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -// canteenIdList.add(screenVo); - } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { - //查询当前登录用户的食堂列表 - String canteenId = sysUser.getCanteenId(); - query.setCanteenId(canteenId); - } else { - return Result.OK(); - } +// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ +// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +//// ScreenVo screenVo = new ScreenVo(); +//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +//// canteenIdList.add(screenVo); +// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { +// //查询当前登录用户的食堂列表 +// String canteenId = sysUser.getCanteenId(); +// query.setCanteenId(canteenId); +// } else { +// return Result.OK(); +// } query.setStatus(3);//(充值=102 return Result.OK(iStClientMemberTransactionRecordService.pageQuery(query)); } @@ -323,20 +323,20 @@ public class StBbzxOrderInfoController { query.setStartTime(split[0]); query.setEndTime(split[1]); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //餐品总库只查询内置食堂 - if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ - // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -// ScreenVo screenVo = new ScreenVo(); -// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -// canteenIdList.add(screenVo); - } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { - //查询当前登录用户的食堂列表 - String canteenId = sysUser.getCanteenId(); - query.setCanteenId(canteenId); - } else { - return Result.OK(); - } +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// //餐品总库只查询内置食堂 +// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ +// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +//// ScreenVo screenVo = new ScreenVo(); +//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +//// canteenIdList.add(screenVo); +// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { +// //查询当前登录用户的食堂列表 +// String canteenId = sysUser.getCanteenId(); +// query.setCanteenId(canteenId); +// } else { +// return Result.OK(); +// } query.setStatus(3);//(充值=102 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class); @@ -358,20 +358,20 @@ public class StBbzxOrderInfoController { query.setStartTime(split[0]); query.setEndTime(split[1]); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //餐品总库只查询内置食堂 - if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ - // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -// ScreenVo screenVo = new ScreenVo(); -// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -// canteenIdList.add(screenVo); - } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { - //查询当前登录用户的食堂列表 - String canteenId = sysUser.getCanteenId(); - query.setCanteenId(canteenId); - } else { - return; - } +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// //餐品总库只查询内置食堂 +// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ +// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +//// ScreenVo screenVo = new ScreenVo(); +//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +//// canteenIdList.add(screenVo); +// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { +// //查询当前登录用户的食堂列表 +// String canteenId = sysUser.getCanteenId(); +// query.setCanteenId(canteenId); +// } else { +// return; +// } query.setStatus(3);//(充值=102 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(statisticsCanteenBusiness)){ diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java index d53f27f..1f06e48 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java @@ -393,6 +393,7 @@ public class StClientMemberBalanceController { @PostMapping("/backOutTopUpAll") @Operation(summary = "用户充值-撤销充值(线下线下二合一)", description = "流水表主键id") + @AutoLog(value = "户充值-撤销充值(线下线下二合一)") public Result backOutTopUpAll(@RequestBody StClientMemberBackTopUpQueryDto query) throws Exception { if(StringUtils.isBlank(query.getCanteenId())){//当前食堂管理员撤销充值该食堂的充值记录 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -409,7 +410,7 @@ public class StClientMemberBalanceController { @PostMapping("/changeBalanceAndIntegral") @Operation(summary = "用户充值-余额调整", description = "传入条件") - @SendNotification() + @AutoLog(value = "用户充值-余额调整") public Result changeBalanceAndIntegral(@RequestBody StClientMemberChangeBalanceDTO query) { if(StringUtils.isBlank(query.getCanteenId())){//当前食堂管理员撤销充值该食堂的充值记录 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -434,9 +435,10 @@ public class StClientMemberBalanceController { query.setStartTime(query.getDates().get(0)); query.setEndTime(query.getDates().get(1)); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String canteenId = sysUser.getCanteenId(); - query.setCanteenId(canteenId); + //余: 去掉鉴权, 要能看到所有的 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String canteenId = sysUser.getCanteenId(); +// query.setCanteenId(canteenId); //消费=101 query.setStatus(101); return Result.OK(iStClientMemberTransactionRecordService.pageQueryNew(query)); @@ -455,20 +457,20 @@ public class StClientMemberBalanceController { query.setStartTime(split[0]); query.setEndTime(split[1]); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //餐品总库只查询内置食堂 - if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ - // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -// ScreenVo screenVo = new ScreenVo(); -// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -// canteenIdList.add(screenVo); - } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { - //查询当前登录用户的食堂列表 - String canteenId = sysUser.getCanteenId(); - query.setCanteenId(canteenId); - } else { - return Result.OK(); - } +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// //餐品总库只查询内置食堂 +// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ +// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +//// ScreenVo screenVo = new ScreenVo(); +//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +//// canteenIdList.add(screenVo); +// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { +// //查询当前登录用户的食堂列表 +// String canteenId = sysUser.getCanteenId(); +// query.setCanteenId(canteenId); +// } else { +// return Result.OK(); +// } query.setStatus(1);//消费=101 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class); @@ -495,20 +497,20 @@ public class StClientMemberBalanceController { if(StringUtils.isNotBlank(query.getEndDate())){ query.setEndTime(query.getEndDate()); } - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - //餐品总库只查询内置食堂 - if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ - // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 -// ScreenVo screenVo = new ScreenVo(); -// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); -// canteenIdList.add(screenVo); - } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { - //查询当前登录用户的食堂列表 - String canteenId = sysUser.getCanteenId(); - query.setCanteenId(canteenId); - } else { - return; - } +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// //餐品总库只查询内置食堂 +// if(sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_0) || sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_1)){ +// // 后期分数据权限时在解开注释，此处管理员账户能看到所有食堂数据 +//// ScreenVo screenVo = new ScreenVo(); +//// screenVo.setId(CommonConstant.INLAY_CANTEEN_ID); +//// canteenIdList.add(screenVo); +// } else if (sysUser.getUserIdentity().equals(CommonConstant.USER_IDENTITY_4)) { +// //查询当前登录用户的食堂列表 +// String canteenId = sysUser.getCanteenId(); +// query.setCanteenId(canteenId); +// } else { +// return; +// } query.setStatus(1);//消费=101 List statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java index e1fc975..44409a8 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java @@ -445,15 +445,15 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl canteenIds = new ArrayList<>(); - if(StringUtils.isEmpty(canteenId)){ - if(sysUser != null){ - canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); - } - }else { +// if(StringUtils.isEmpty(canteenId)){ +// if(sysUser != null){ +// canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); +// } +// }else { canteenIds = Collections.singletonList(canteenId); - } +// } //获取数据列表 List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpent(canteenIds, startDate, endDate); if(CollectionUtils.isEmpty(statisticsTheAmountSpentVos)){ @@ -505,15 +505,15 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl canteenIds = new ArrayList<>(); - if(StringUtils.isEmpty(canteenId)){ - if(sysUser != null){ - canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); - } - }else { +// if(StringUtils.isEmpty(canteenId)){ +// if(sysUser != null){ +// canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); +// } +// }else { canteenIds = Collections.singletonList(canteenId); - } +// } //获取数据列表 List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpent(canteenIds, startDate, endDate); if(CollectionUtils.isEmpty(statisticsTheAmountSpentVos)){ @@ -577,16 +577,16 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl canteenIds = new ArrayList<>(); - if(StringUtils.isEmpty(canteenId)){ - if(sysUser != null){ - canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); - } - }else { - canteenIds = Collections.singletonList(canteenId); - } - List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpentEveryMember(canteenIds,name,payName,startDate, endDate, secondDepartId, thirdDepartId); +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List canteenIds = new ArrayList<>(); +// if(StringUtils.isEmpty(canteenId)){ +// if(sysUser != null){ +// canteenIds = sysUser.getCanteenIdList().stream().map(ScreenVo::getId).collect(Collectors.toList()); +// } +// }else { +// canteenIds = Collections.singletonList(canteenId); +// } + List statisticsTheAmountSpentVos = baseMapper.statisticsTheAmountSpentEveryMember(null,name,payName,startDate, endDate, secondDepartId, thirdDepartId); if(CollectionUtils.isEmpty(statisticsTheAmountSpentVos)){ return new Page<>(); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java index 0ea0f3c..7c9541d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/restaurant/controller/StBaseRestaurantDeptController.java @@ -34,11 +34,11 @@ public class StBaseRestaurantDeptController { @Operation(summary = "获得食堂数据", description= "获得食堂数据") @GetMapping(value = "/getRestaurantList") public Result getRestaurantList() { - LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List list = user.getCanteenIdList(); - if(CollectionUtils.isNotEmpty(list)){ - return Result.OK(list); - } else {//解决管理员（医生）角色，查看 营养监控 没有食堂列表问题 +// LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List list = user.getCanteenIdList(); +// if(CollectionUtils.isNotEmpty(list)){ +// return Result.OK(list); +// } else {//解决管理员（医生）角色，查看 营养监控 没有食堂列表问题 List screenVoArrayList = new ArrayList<>(); List slBaseRestaurantList = slBaseRestaurantService.list(); if(CollectionUtils.isNotEmpty(slBaseRestaurantList)){ @@ -52,7 +52,7 @@ public class StBaseRestaurantDeptController { }); } return Result.OK(screenVoArrayList); - } +// } } @Operation(summary = "获得食堂数据", description= "获得食堂数据")