From c0af59d13f40da17daafe08be5923c26411e9f71 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 20 三月 2025 15:31:48 +0800 Subject: [PATCH] 修改报表bug --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 76 ++++++++++++++++++++----------------- 1 files changed, 41 insertions(+), 35 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java index 3259d9e..15274c2 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java @@ -12,6 +12,7 @@ import com.ruoyi.account.api.feignClient.AppUserCarClient; import com.ruoyi.account.api.feignClient.AppUserClient; import com.ruoyi.account.api.model.TAppUserCar; +import com.ruoyi.chargingPile.api.domain.SiteMenu; import com.ruoyi.chargingPile.api.dto.GetSiteListDTO; import com.ruoyi.chargingPile.api.feignClient.*; import com.ruoyi.chargingPile.api.model.Site; @@ -53,11 +54,15 @@ import com.ruoyi.order.service.*; import com.ruoyi.order.util.PreviousSixMonths; import com.ruoyi.order.vo.EndOfChargePageInfo; +import com.ruoyi.other.api.feignClient.RoleSiteClient; +import com.ruoyi.other.api.feignClient.UserSiteClient; import com.ruoyi.payment.api.feignClient.AliPaymentClient; import com.ruoyi.payment.api.feignClient.WxPaymentClient; import com.ruoyi.payment.api.vo.AliQueryOrder; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; +import com.ruoyi.system.api.feignClient.SysUserRoleClient; +import com.ruoyi.system.api.model.SysUserRoleVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -146,6 +151,14 @@ private PartnerClient partnerClient; @Resource private SysUserClient sysUserClient; + + @Resource + private UserSiteClient userSiteClient; + + @Resource + private RoleSiteClient roleSiteClient; + @Resource + private SysUserRoleClient sysUserRoleClient; @@ -1063,7 +1076,6 @@ @ApiOperation(value = "底部数据分类", tags = {"后台-数据分析-平台收入分析"}) public R<Map<String,Object>> total() { //count近6个月的数据 - LocalDateTime sixBefore = LocalDate.now().minusMonths(6).atTime(0, 0, 0); Long userId = tokenService.getLoginUser().getUserid(); //获取当前登录的siteIds List<Integer> siteIds = new ArrayList<>(); @@ -1075,18 +1087,18 @@ if (siteIds.isEmpty()){ siteIds.add(-1); } - Map<String,Object> map = chargingOrderService.countAll(sixBefore,siteIds); - BigDecimal data = parkingLotClient.getRecordAmount(sixBefore.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).getData(); + Map<String,Object> map = chargingOrderService.countAll(siteIds); + BigDecimal data = parkingLotClient.getRecordAmount().getData(); if (map ==null){ map = new HashMap<String,Object>(); } map.put("parkingAmount",data); - BigDecimal data1 = shoppingOrderService.getSumAmount(sixBefore); + BigDecimal data1 = shoppingOrderService.getSumAmount(); map.put("shopAmount",data1); - BigDecimal data2 = vipOrderService.getSumAmout(sixBefore); + BigDecimal data2 = vipOrderService.getSumAmout(); map.put("vipAmount",data2); List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getStatus, 5).eq(TChargingOrder::getDelFlag, 0) - .eq(TChargingOrder::getRechargePaymentStatus, 2).between(TChargingOrder::getCreateTime, sixBefore, LocalDateTime.now()).list(); + .eq(TChargingOrder::getRechargePaymentStatus, 2).list(); BigDecimal sharingAmount = BigDecimal.ZERO; BigDecimal commissionAmount = BigDecimal.ZERO; //计算list中electrovalence的总和 @@ -1099,9 +1111,9 @@ BigDecimal periodElectricPrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal periodServicePrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add); totalElectrovalence = totalElectrovalence.add(periodElectricPrice); - commissionAmount = commissionAmount.add(order.getRechargeAmount().multiply(new BigDecimal("0.006"))); if(2 != order.getOrderSource()){ totalServiceCharge = totalServiceCharge.add(periodServicePrice); + commissionAmount = commissionAmount.add((periodElectricPrice.add(periodServicePrice)).multiply(new BigDecimal("0.006"))); }else{ totalServiceCharge = totalServiceCharge.add(periodServicePrice.multiply(new BigDecimal("0.8"))); sharingAmount = sharingAmount.add(periodServicePrice.multiply(new BigDecimal("0.2"))); @@ -1120,38 +1132,29 @@ @PostMapping(value = "/watch/chargingOrder") @ApiOperation(value = "监控订单", tags = {"管理后台-订单管理"}) public R watchChargingOrder(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery) { - Long userid = tokenService.getLoginUser().getUserid(); + Set<Integer> ids = null; + //校验合作商权限 SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData(); Integer roleType = sysUser.getRoleType(); - List<Integer> siteIds = new ArrayList<>(); - if (mongoChargingOrderQuery.getSiteId()==null){ - List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userid).getData(); - for (GetSiteListDTO datum : data) { - siteIds.add(datum.getId()); - } - }else { - siteIds.add(mongoChargingOrderQuery.getSiteId()); - } - if (siteIds.isEmpty()){ - siteIds.add(-1); + Integer objectId = sysUser.getObjectId(); + R<Integer> admin = sysUserClient.isAdmin(tokenService.getLoginUser().getUserid()); + //合作商 + if(roleType == 2){ + ids = partnerClient.authSite(objectId, SiteMenu.SITE_LIST.getValue()).getData(); }else{ - if (roleType == 2){ - List<Integer> integers = new ArrayList<>(); - for (Integer siteId : siteIds) { - // 校验有没有这个站点的权限 - List<Boolean> t1= partnerClient.watchChargingOrder(sysUser.getObjectId(),siteId).getData(); - Boolean b = t1.get(1); - if (b){ - integers.add(siteId); - } + //非管理员需要根据角色和用户配置查询允许的站点数据 + //改用roleId=1来判断 + if(admin.getData()!=1){ + List<Integer> data = userSiteClient.getSiteIds(sysUser.getUserId()).getData(); + List<SysUserRoleVo> data2 = sysUserRoleClient.getRoleByUserId(sysUser.getUserId()).getData(); + if(data2.size() > 0){ + List<Integer> data1 = roleSiteClient.getSiteIds(data2.get(0).getRoleId()).getData(); + data.addAll(data1); } - siteIds = integers; + ids = new HashSet<>(data); } } - if (siteIds.isEmpty()){ - siteIds.add(-1); - } - mongoChargingOrderQuery.setSiteIds(siteIds); + mongoChargingOrderQuery.setSiteIds(ids); mongoChargingOrderQuery.setPageSize(10); R<UploadRealTimeMonitoringPageData> all = uploadRealTimeMonitoringDataClient.getAll(mongoChargingOrderQuery); UploadRealTimeMonitoringPageData data1 = all.getData(); @@ -1440,15 +1443,17 @@ tCharingOrderMapVO.setMaps(maps); BigDecimal allMoney = new BigDecimal(0); + BigDecimal commissionAmount = BigDecimal.ZERO; for (Map<String, Object> map : maps) { BigDecimal periodElectricPrice = (BigDecimal) map.get("period_electric_price"); allMoney = allMoney.add(periodElectricPrice); BigDecimal total_amount = (BigDecimal) map.get("total_amount"); allMoney = allMoney.add(total_amount); + commissionAmount = commissionAmount.add((BigDecimal) map.get("commissionAmount")); } allMoney = allMoney.multiply(new BigDecimal("0.006")); - tCharingOrderMapVO.setAllMoney(allMoney); + tCharingOrderMapVO.setCommissionAmount(commissionAmount); return R.ok(tCharingOrderMapVO); } @@ -1864,7 +1869,8 @@ LocalDateTime max = selectDate.with(LocalTime.MAX); List<TChargingOrder> list = chargingOrderService.lambdaQuery().in(!siteIds.isEmpty(), TChargingOrder::getSiteId, siteIds) - .between(TChargingOrder::getCreateTime, min, max).eq(TChargingOrder::getStatus,5) + .between(TChargingOrder::getCreateTime, min, max).eq(TChargingOrder::getStatus,5).eq(TChargingOrder::getDelFlag, 0) + .eq(TChargingOrder::getRechargePaymentStatus, 2) .eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list(); //当日的订单总数 int size = list.size(); -- Gitblit v1.7.1