From 1b81b84edaeea9b200c622e4a34c49b4b1aaac92 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 06 三月 2025 15:28:19 +0800 Subject: [PATCH] 修改bug和漏洞修复 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java | 172 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 95 insertions(+), 77 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java index 3d81a92..84ec02b 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingBillServiceImpl.java @@ -88,13 +88,7 @@ @Override public ChargingBillVO chargingBillList1(ChargingListQuery dto) { - if (dto.getState()!=null){ - if (dto.getState()==1){ - dto.setState(2); - }else { - dto.setState(1); - } - } + ChargingBillVO chargingBillVO = new ChargingBillVO(); List<TChargingOrder> tChargingOrders1 = new ArrayList<>(); String startTime1 = null; @@ -104,9 +98,7 @@ startTime1 = split[0]; startTime2 = split[1]; } - Long userId = tokenService.getLoginUser().getUserid(); - // 查询当前登陆人按钮权限 - SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData(); + List<Site> siteList = siteClient.getSiteAll().getData(); List<TChargingGun> gunList = chargingGunClient.getAllGun().getData(); List<TChargingPile> pileList = chargingGunClient.getAllPile().getData(); @@ -115,38 +107,44 @@ List<TChargingOrder> total = chargingOrderList.selectList(new LambdaQueryWrapper<>(TChargingOrder.class) .eq(TChargingOrder::getRechargePaymentStatus, 2)); List<TChargingOrderRefund> totalRefund = chargingOrderRefundService.lambdaQuery().eq(TChargingOrderRefund::getRefundStatus, 2).list(); + Long userId = tokenService.getLoginUser().getUserid(); + // 查询当前登陆人按钮权限 + SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData(); Integer roleType = sysUser.getRoleType(); + //如果没传siteId,获取当前登陆人所有的siteIds List<Integer> siteIds = new ArrayList<>(); - //如果没传siteId,获取当前登陆人所有的siteIds - if (dto.getSiteId()==null){ - if (userId != null){ - List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData(); - for (GetSiteListDTO datum : data) { - siteIds.add(datum.getId()); - } + if (dto.getSiteId()==null){ + if (userId != null){ + List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData(); + for (GetSiteListDTO datum : data) { + siteIds.add(datum.getId()); } - }else { - siteIds.add(dto.getSiteId()); } - if (siteIds.isEmpty()){ - siteIds.add(-1); - }else{ - if (roleType == 2){ - List<Integer> integers = new ArrayList<>(); - for (Integer siteId : siteIds) { - // 校验有没有这个站点的权限 - List<Boolean> t1= partnerClient.getAccountMenu(sysUser.getObjectId(),siteId).getData(); + }else { + siteIds.add(dto.getSiteId()); + } + if (siteIds.isEmpty()){ + siteIds.add(-1); + }else{ + if (roleType == 2){ + List<Integer> integers = new ArrayList<>(); + for (Integer siteId : siteIds) { + // 校验有没有这个站点的权限 + List<Boolean> t1= partnerClient.getChargingOrderMenu(sysUser.getObjectId(),siteId).getData(); - Boolean b = t1.get(1); - if (b){ - integers.add(siteId); - } + Boolean b = t1.get(1); + if (b){ + integers.add(siteId); } - siteIds = integers; } + siteIds = integers; } - if (siteIds.isEmpty())siteIds.add(-1); - dto.setSiteIds(siteIds); + } + if (roleType==1){ + siteIds.add(0); + } + if (siteIds.isEmpty())siteIds.add(-1); + dto.setSiteIds(siteIds); PageInfo<ChargingBillListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize()); @@ -162,7 +160,6 @@ BigDecimal sharingAmountTotal = new BigDecimal("0"); BigDecimal chargingCapacityTotal = new BigDecimal("0"); BigDecimal discountTotal = new BigDecimal("0"); - int orderCount = 0; for (ChargingBillListVO chargingBillListVO : list) { @@ -223,7 +220,6 @@ BigDecimal sharingAmount = new BigDecimal("0"); BigDecimal chargingCapacity = new BigDecimal("0"); BigDecimal refundAmount = new BigDecimal("0"); - orderCount+=tChargingOrders.size(); chargingBillVO.setCategory(""); chargingBillVO.setExportList(tChargingOrders); for (TChargingOrder tChargingOrder : tChargingOrders) { @@ -319,21 +315,24 @@ } TAppUser data3 = userList.stream().filter(e -> e.getId().equals(tChargingOrder.getAppUserId())).findFirst().orElse(null); + if (data3!=null)tChargingOrder.setUserName(data3.getName()); + if (tChargingOrder.getAppUserCarId()!=null){ TAppUserCar data4 = carList.stream().filter(e -> e.getId().equals(tChargingOrder.getAppUserCarId())).findFirst().orElse(null); if (data4!=null){ tChargingOrder.setLicensePlate(data4.getLicensePlate()); tChargingOrder.setVehicleModel(data4.getVehicleModel()); } + }else{ + tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum()); } - if (data3!=null)tChargingOrder.setUserName(data3.getName()); // 累加实收金额 支付结算金额 - if (tChargingOrder.getChargeAmount()!=null){ - paymentAmount = paymentAmount.add(tChargingOrder.getRechargeAmount()); + if (tChargingOrder.getRechargeAmount()!=null){ + paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); } // 总金额 - if (tChargingOrder.getOrderAmount()!=null){ - orderAmount = orderAmount.add(tChargingOrder.getOrderAmount()); + if (tChargingOrder.getRechargeAmount()!=null){ + orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount()); } // 累加累计电费 if (tChargingOrder.getElectrovalence()!=null){ @@ -352,7 +351,7 @@ } // 累加平台手续费 if (tChargingOrder.getOrderAmount()!=null){ - commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006)) + commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006)) .setScale(2,BigDecimal.ROUND_DOWN)); } // 累加平台分佣 @@ -376,8 +375,8 @@ chargingBillVO.setPaymentAmount(BigDecimal.ZERO); } - chargingBillListVO.setPaymentAmount(rechargeAmount); - chargingBillListVO.setOrderAmount(paymentAmount == null?BigDecimal.ZERO:orderAmount.subtract(sharingAmount).subtract(commissionAmount)); + chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount)); + chargingBillListVO.setOrderAmount(refundAmount); chargingBillListVO.setRefundAmount(refundAmount == null?BigDecimal.ZERO:refundAmount); chargingBillListVO.setElectrovalence(electrovalence == null?BigDecimal.ZERO:electrovalence); chargingBillListVO.setServiceCharge(serviceCharge == null?BigDecimal.ZERO:serviceCharge); @@ -432,18 +431,14 @@ e.getSiteId().equals(chargingBillListVO.getSiteId()) : true && e.getPayTime().isBefore(lastDayOfMonth.withHour(23).withMinute(59).withSecond(59)) && e.getPayTime().isAfter(firstDayOfMonth.withHour(0).withMinute(0).withSecond(0))).collect(Collectors.toList()); - tChargingOrders1.addAll(tChargingOrders); - orderCount+=tChargingOrders.size(); - chargingBillVO.setCategory(""); - chargingBillVO.setExportList(tChargingOrders); for (TChargingOrder tChargingOrder : tChargingOrders) { if (tChargingOrder.getOrderAmount()!=null){ - paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getRechargeAmount()); + paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()); } // 累加订单金额 - if (tChargingOrder.getOrderAmount()!=null){ - orderAmountTotal = orderAmountTotal.add(tChargingOrder.getOrderAmount()); + if (tChargingOrder.getRechargeAmount()!=null){ + orderAmountTotal = orderAmountTotal.add(tChargingOrder.getRechargeAmount()); } // 累加累计电费 if (tChargingOrder.getElectrovalence()!=null){ @@ -464,7 +459,7 @@ } // 累加平台手续费 if (tChargingOrder.getOrderAmount()!=null){ - commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")) + commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")) .setScale(2,BigDecimal.ROUND_DOWN)); } // 累加平台分佣 @@ -484,14 +479,15 @@ discountTotal = discountTotal.add(tChargingOrder.getVipDiscountAmount()); } } + tChargingOrders1.addAll(tChargingOrders); + chargingBillVO.setExportList(tChargingOrders); } chargingBillVO.setOrderCount(i); chargingBillVO.setChargingCapacity(chargingCapacityTotal); chargingBillVO.setPaymentAmount(paymentAmountTotal); - chargingBillVO.setOrderAmount(orderAmountTotal.subtract(commissionAmountTotal).subtract(sharingAmountTotal)); + chargingBillVO.setOrderAmount(orderAmountTotal); chargingBillVO.setElectrovalence(electrovalenceTotal); chargingBillVO.setServiceCharge(serviceChargeTotal); - chargingBillVO.setOrderCount(orderCount); chargingBillVO.setCommissionAmount(commissionAmountTotal); chargingBillVO.setSharingAmount(sharingAmountTotal); chargingBillVO.setDiscount(discountTotal); @@ -574,7 +570,6 @@ siteIds.add(-1); } dto.setSiteIds(siteIds); - List<ChargingBillListVO> list = this.baseMapper.chargingBillList(pageInfo,dto,startTime1,startTime2); List<ChargingBillListVO> list1 = this.baseMapper.chargingBillListNoLimit(dto,startTime1,startTime2); BigDecimal paymentAmountTotal = new BigDecimal("0"); @@ -660,8 +655,10 @@ chargingBillVO.setCategory(""); chargingBillListVO.setOrderCount(tChargingOrders.size()); chargingBillVO.setExportList(tChargingOrders); - + int t = 1; for (TChargingOrder tChargingOrder : tChargingOrders) { + tChargingOrder.setXuhao(t); + t++; if (tChargingOrder.getRechargePaymentType()!=null && tChargingOrder.getRechargePaymentType()==1){ chargingBillListVO.setPayTypeName("微信商户"); } @@ -754,9 +751,15 @@ tChargingOrder.setLicensePlate(tAppUserCar.getLicensePlate()); tChargingOrder.setVehicleModel(tAppUserCar.getVehicleModel()); } + }else{ + tChargingOrder.setLicensePlate(tChargingOrder.getPlateNum()); } - if (data3!=null)tChargingOrder.setUserName(data3.getName()); - if ( tChargingOrder.getPaymentAmount()!=null){ + if (data3!=null){ + tChargingOrder.setUserName(data3.getName()); + tChargingOrder.setPhone(data3.getPhone()); + } + if ( tChargingOrder.getPaymentAmount()!=null&&(!tChargingOrder.getOrderSource().equals(2))){ + // 实收 paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); } // 总金额 @@ -772,17 +775,22 @@ } // 累加累计服务费 if (tChargingOrder.getServiceCharge()!=null){ - serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge()); + if (tChargingOrder.getOrderSource().equals(2)) { + serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN)); + // 累加平台分佣 + sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN)); + // 累加实收 + paymentAmount = paymentAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN)); + }else { + serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge()); + } } // 累加平台手续费 if (tChargingOrder.getOrderAmount()!=null){ - commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(BigDecimal.valueOf(0.006)) + commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(BigDecimal.valueOf(0.006)) .setScale(2,BigDecimal.ROUND_DOWN)); } - // 累加平台分佣 - if (tChargingOrder.getSharingAmount()!=null){ - sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount()); - } + // 累加充电度数 if (tChargingOrder.getChargingCapacity()!=null){ chargingCapacity = chargingCapacity.add(tChargingOrder.getChargingCapacity()); @@ -797,7 +805,7 @@ chargingBillVO.setChargingTime(timeString); chargingBillListVO.setOrderAmount(paymentAmount); - chargingBillListVO.setPaymentAmount(paymentAmount.subtract(commissionAmount).subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN)); + chargingBillListVO.setPaymentAmount(paymentAmount.subtract(sharingAmount).setScale(2,BigDecimal.ROUND_DOWN)); chargingBillListVO.setElectrovalence(electrovalence); chargingBillListVO.setServiceCharge(serviceCharge.setScale(2,BigDecimal.ROUND_DOWN)); chargingBillListVO.setCommissionAmount(commissionAmount.setScale(2,BigDecimal.ROUND_DOWN)); @@ -859,11 +867,12 @@ BigDecimal chargingCapacity = new BigDecimal("0"); chargingBillListVO.setOrderCount(tChargingOrders.size()); for (TChargingOrder tChargingOrder : tChargingOrders) { - // 累加实收金额 支付金额减去退款金额 - if (tChargingOrder.getPaymentAmount()!=null){ + // 累加实收金额 + if ( tChargingOrder.getPaymentAmount()!=null&&(!tChargingOrder.getOrderSource().equals(2))){ paymentAmount = paymentAmount.add(tChargingOrder.getPaymentAmount()); paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getPaymentAmount()); } + // 累加订单金额 if (tChargingOrder.getRechargeAmount()!=null){ orderAmount = orderAmount.add(tChargingOrder.getRechargeAmount()); @@ -879,20 +888,29 @@ } // 累加累计服务费 if (tChargingOrder.getServiceCharge()!=null){ - serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge()); - serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge()); + if (tChargingOrder.getOrderSource().equals(2)) { + serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN)); + serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN)); + // 累加平台分佣 + sharingAmount = sharingAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN)); + sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2, BigDecimal.ROUND_DOWN)); + // 累加实收 + paymentAmount = paymentAmount.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN)); + paymentAmountTotal = paymentAmountTotal.add(tChargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN)); + }else{ + serviceCharge = serviceCharge.add(tChargingOrder.getServiceCharge()); + serviceChargeTotal = serviceChargeTotal.add(tChargingOrder.getServiceCharge()); + } + } - // 累加平台手续费 + + // 累加平台手续费 if (tChargingOrder.getOrderAmount()!=null){ - commissionAmount = commissionAmount.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN)); - commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getPaymentAmount().multiply(new BigDecimal("0.006")) + commissionAmount = commissionAmount.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")).setScale(2,BigDecimal.ROUND_DOWN)); + commissionAmountTotal = commissionAmountTotal.add(tChargingOrder.getRechargeAmount().multiply(new BigDecimal("0.006")) .setScale(2,BigDecimal.ROUND_DOWN)); } - // 累加平台分佣 - if (tChargingOrder.getSharingAmount()!=null){ - sharingAmount = sharingAmount.add(tChargingOrder.getSharingAmount()); - sharingAmountTotal = sharingAmountTotal.add(tChargingOrder.getSharingAmount()); - } + // 累加充电度数 if (tChargingOrder.getElectricity()!=null){ chargingCapacity = chargingCapacity.add(tChargingOrder.getElectricity()); -- Gitblit v1.7.1