diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java index c961176ab..e36155178 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysDeptServiceImpl.java @@ -87,6 +87,16 @@ public class SysDeptServiceImpl extends ServiceImpl impl public Boolean removeDeptById(Long id) { // 级联删除部门 List idList = this.listDescendant(id).stream().map(SysDept::getDeptId).collect(Collectors.toList()); + if (idList.size() > 1) throw new RuntimeException("该部门下有子部门,无法删除"); + + for (Long v : idList) { + // 查询该部门下的用户 + List userList = userMapper.selectList(Wrappers.lambdaQuery().eq(SysUser::getDeptId, v)); + if (CollUtil.isNotEmpty(userList)) { + SysDept sysDept = baseMapper.selectById(v); + throw new RuntimeException("该部门<" + sysDept.getName() + ">下有" + userList.size() + "名用户,无法删除,请先删除该部门下的用户"); + } + } Optional.ofNullable(idList).filter(CollUtil::isNotEmpty).ifPresent(this::removeByIds); diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyCompareVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyCompareVo.java index 6c74117c4..8b283f1dd 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyCompareVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyCompareVo.java @@ -23,15 +23,10 @@ public class WalletRechargeApplyCompareVo extends HashMap { */ private String userMobile; - /** - * 操作前的余额 - */ - private Integer prenBalance; - /** * 扣减之后的余额 */ - private Integer discountBalance; + private Integer afterBalance; public void setUserId(Long userId) { this.userId = userId; @@ -69,21 +64,12 @@ public class WalletRechargeApplyCompareVo extends HashMap { this.put("userMobile", userMobile); } - public Integer getPrenBalance() { - return (Integer) this.get("prenBalance"); + public Integer getAfterBalance() { + return (Integer) this.get("afterBalance"); } - public void setPrenBalance(Integer prenBalance) { - this.prenBalance = prenBalance; - this.put("prenBalance", prenBalance); - } - - public Integer getDiscountBalance() { - return (Integer) this.get("discountBalance"); - } - - public void setDiscountBalance(Integer discountBalance) { - this.discountBalance = discountBalance; - this.put("discountBalance", discountBalance); + public void setAfterBalance(Integer discountBalance) { + this.afterBalance = discountBalance; + this.put("afterBalance", discountBalance); } } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplySelectCompareVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplySelectCompareVo.java index 97de6fff6..89aa740ea 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplySelectCompareVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplySelectCompareVo.java @@ -18,7 +18,7 @@ public class WalletRechargeApplySelectCompareVo { @Schema(description = "当前月的金额") private Integer price; - @Schema(description = "总金额(加上倒入)") + @Schema(description = "总金额(加上导入)") private Integer totalPrice; @Schema(description = "充值月", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyComposeServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyComposeServiceImpl.java index a9ebfbf21..88e536a58 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyComposeServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyComposeServiceImpl.java @@ -151,25 +151,6 @@ public class WalletRechargeApplyComposeServiceImpl implements WalletRechargeAppl } } - // 查询当前钱包余额 - WalletManageDto userWalletDto = new WalletManageDto(); - userWalletDto.setUserIds(userIdList); - userWalletDto.setWalletTypeId(topUpApplyDetail.getWalletTypeId()); - List userWalletList = walletManageMapper.list(userWalletDto); - if (ObjectUtil.isNotEmpty(userWalletList) && ObjectUtil.isNotEmpty(resultList)) { - for (WalletRechargeApplyCompareVo i : resultList) { - userWalletList.stream().filter(j -> ObjectUtil.equals(i.getUserId(), j.getUserId())).findFirst().ifPresent(j -> { - i.setPrenBalance(j.getBalance()); - if (ObjectUtil.equals(topUpApplyDetail.getBizType(), WalletBizRechargeEnum.REDUCTION.getCode())) { - Integer currentImportPrice = (Integer) i.get("currentImport_price"); - if (ObjectUtil.isNotEmpty(currentImportPrice)) { - i.setDiscountBalance(j.getBalance() - currentImportPrice); - } - } - }); - } - } - resultVo.setRecords(resultList); List tableListStr = new ArrayList<>(); tableListStr.add(merge.get(0) + "(上个月总充值金额)"); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java index e73c503c4..b2b2756c4 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeApplyServiceImpl.java @@ -198,17 +198,19 @@ public class WalletRechargeApplyServiceImpl extends ServiceImpl ObjectUtil.equals(i.getUserId(), j.getUserId())).findFirst().ifPresent(wallet -> { int discountPrice = wallet.getBalance() - i.getPrice(); - // 查询用户名字 - UserVO userTarget = userList.stream().filter(j -> ObjectUtil.equals(i.getUserId(), j.getUserId())).findFirst().get(); - if (ObjectUtil.isEmpty(userTarget)) { - errorMsg.append("用户id<").append(wallet.getUserId()).append(">"); - } else { - errorMsg.append("用户名<").append(userTarget.getName()).append(">"); + if (discountPrice < 0) { + // 查询用户名字 + UserVO userTarget = userList.stream().filter(j -> ObjectUtil.equals(i.getUserId(), j.getUserId())).findFirst().get(); + if (ObjectUtil.isEmpty(userTarget)) { + errorMsg.append("用户id<").append(wallet.getUserId()).append(">"); + } else { + errorMsg.append("用户名<").append(userTarget.getName()).append(">"); + } + errorMsg.append("记账扣款失败,"); + errorMsg.append("操作前的金额<").append(wallet.getBalance() / 100).append(">,"); + errorMsg.append("记账扣款的金额<").append(i.getPrice() / 100).append(">,"); + errorMsg.append("记账扣款后的金额<").append(discountPrice / 100).append(">\n"); } - errorMsg.append("记账扣款失败,"); - errorMsg.append("操作前的金额<").append(wallet.getBalance() / 100).append(">,"); - errorMsg.append("记账扣款的金额<").append(i.getPrice() / 100).append(">,"); - errorMsg.append("记账扣款后的金额<").append(discountPrice / 100).append(">\n"); }); } String errorMsgString = errorMsg.toString(); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml index a3447be01..8379e5bf8 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml @@ -40,7 +40,9 @@ FROM wallet_transaction a INNER JOIN wallet_manage w ON w.id = a.wallet_id - WHERE biz_type = #{bizType} + WHERE + a.del_flag = '0' + and a.biz_type = #{bizType} and DATE_FORMAT(a.create_time, '%Y-%m') = #{dateTime} and w.user_id in