diff --git a/bonus-modules/bonus-canteen/src/main/java/net/xnzn/core/allocation/mobile/service/impl/BasicPageDecorationServiceImpl.java b/bonus-modules/bonus-canteen/src/main/java/net/xnzn/core/allocation/mobile/service/impl/BasicPageDecorationServiceImpl.java index d863a62..1e21731 100644 --- a/bonus-modules/bonus-canteen/src/main/java/net/xnzn/core/allocation/mobile/service/impl/BasicPageDecorationServiceImpl.java +++ b/bonus-modules/bonus-canteen/src/main/java/net/xnzn/core/allocation/mobile/service/impl/BasicPageDecorationServiceImpl.java @@ -239,10 +239,10 @@ public class BasicPageDecorationServiceImpl extends ServiceImpl basicsPagedecorationVO.getApplyPage() - .equals(BasicsApplyPageEnum.MY_SERVICE.key())).toList()); + .equals(BasicsApplyPageEnum.MY_SERVICE.key())).collect(Collectors.toList())); return queryBasicsPagedecorationVO; diff --git a/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/account/service/DzAccWalletServiceImpl.java b/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/account/service/DzAccWalletServiceImpl.java index 97d1d5b..6afbf0b 100644 --- a/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/account/service/DzAccWalletServiceImpl.java +++ b/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/account/service/DzAccWalletServiceImpl.java @@ -152,7 +152,7 @@ public class DzAccWalletServiceImpl extends AccWalletServiceImpl { errList.add(accWalletImportErrVO); return; } - CustInfoForRechargeVO custInfoVO = custInfoVOList.getFirst(); + CustInfoForRechargeVO custInfoVO = custInfoVOList.get(0); //4.校验姓名是否和数据库的姓名一致 if (StringUtils.isNotBlank(walletImportModel.getCustName()) && !StrUtil.equals(walletImportModel.getCustName(), custInfoVO.getCustName())) { // NOSONAR accWalletImportErrVO.setMessage("用户姓名不正确"); @@ -166,7 +166,7 @@ public class DzAccWalletServiceImpl extends AccWalletServiceImpl { return; } //6.根据人员id获取账户钱包信息 - AccInfoVO accInfoVO = custIdToAccInfo.get(custInfoVO.getCustId()).getFirst(); + AccInfoVO accInfoVO = custIdToAccInfo.get(custInfoVO.getCustId()).get(0); //校验账户信息 try { this.checkAccInfo(accInfoVO); @@ -197,7 +197,7 @@ public class DzAccWalletServiceImpl extends AccWalletServiceImpl { //dz-校验规则 AccWalletInfoVO accWalletInfoVO = accInfoVO.getWalletInfoList().stream() - .filter(item -> item.getWalletId().equals(AccWalletIdEnum.WALLET.getKey())).toList().getFirst(); + .filter(item -> item.getWalletId().equals(AccWalletIdEnum.WALLET.getKey())).collect(Collectors.toList()).get(0); //返回结果赋值 AccWalletImportSucVO accWalletImportSucVO = AccWalletImportSucVO.builderSucByCustInfo(custInfoVO); //账户现在总余额 diff --git a/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/kitchen/service/DzDevicePassengerFlowServiceImpl.java b/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/kitchen/service/DzDevicePassengerFlowServiceImpl.java index 0ae87cd..59db861 100644 --- a/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/kitchen/service/DzDevicePassengerFlowServiceImpl.java +++ b/bonus-modules/bonus-canteen/src/main/java/net/xnzn/yunshitang/kitchen/service/DzDevicePassengerFlowServiceImpl.java @@ -50,7 +50,7 @@ public class DzDevicePassengerFlowServiceImpl { deviceQueryPresentNumVo.setCanteenId(allocCanteen.getCanteenId()); deviceQueryPresentNumVo.setCanteenName(allocCanteen.getCanteenName()); if (collect.containsKey(allocCanteen.getCanteenId())) { - Integer presentNum = collect.get(allocCanteen.getCanteenId()).getFirst().getPresentNum(); + Integer presentNum = collect.get(allocCanteen.getCanteenId()).get(0).getPresentNum(); if (ObjectUtil.isNotEmpty(allocCanteen.getCapacity()) && presentNum > 0) { int remainingSeats = allocCanteen.getCapacity() - presentNum; if (remainingSeats < 0) { @@ -64,7 +64,7 @@ public class DzDevicePassengerFlowServiceImpl { } else { deviceQueryPresentNumVo.setRemainingSeats(allocCanteen.getCapacity()); } - deviceQueryPresentNumVo.setDiningNum(collect.get(allocCanteen.getCanteenId()).getFirst().getPresentNum()); + deviceQueryPresentNumVo.setDiningNum(collect.get(allocCanteen.getCanteenId()).get(0).getPresentNum()); } else { deviceQueryPresentNumVo.setRemainingSeats(ObjectUtil.isEmpty(allocCanteen.getCapacity()) ? 0 : allocCanteen.getCapacity()); }