From 073790a8e3f2aaa352ead3157b23b6ce4b5d1ae0 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 15 七月 2025 15:54:38 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 90 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 insertions(+), 10 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 c67c52a..e0a61d3 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 @@ -1,5 +1,6 @@ package com.ruoyi.order.controller; import com.alibaba.fastjson2.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import java.math.BigDecimal; @@ -59,6 +60,7 @@ import com.ruoyi.order.util.PreviousSixMonths; import com.ruoyi.order.util.mongodb.service.UploadRealTimeMonitoringDataService; import com.ruoyi.order.vo.EndOfChargePageInfo; +import com.ruoyi.order.vo.StatisticsOfBatteryVO; import com.ruoyi.order.vo.WatchChargingOrderVo; import com.ruoyi.other.api.feignClient.RoleSiteClient; import com.ruoyi.other.api.feignClient.UserSiteClient; @@ -852,7 +854,17 @@ @RequestParam("attach") String attach) { chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach); } - + /** + * 支付宝H5支付成功后的回调 + */ + @ResponseBody + @PostMapping(value = "/chargingOrderALIH5Callback") + public void chargingOrderALIH5Callback(@RequestParam("out_trade_no") String out_trade_no, + @RequestParam("transaction_id") String transaction_id, + @RequestParam("attach") String attach) { + chargingOrderService.chargingOrderCallback(3, out_trade_no, transaction_id, attach); + } + /** * @@ -1107,6 +1119,7 @@ public R<Map<String,Object>> total() { //count近6个月的数据 Long userId = tokenService.getLoginUser().getUserid(); + SysUser sysUser = sysUserClient.getSysUser(userId).getData(); //获取当前登录的siteIds List<Integer> siteIds = new ArrayList<>(); List<GetSiteListDTO> data9 = siteClient.getSiteListByUserId(userId).getData(); @@ -1118,17 +1131,23 @@ siteIds.add(-1); } Map<String,Object> map = chargingOrderService.countAll(siteIds); - BigDecimal data = parkingLotClient.getRecordAmount().getData(); - if (map ==null){ - map = new HashMap<String,Object>(); + if(1 == sysUser.getObjectId()){ + BigDecimal data = parkingLotClient.getRecordAmount().getData(); + if (map ==null){ + map = new HashMap<String,Object>(); + } + map.put("parkingAmount",data); + BigDecimal data1 = shoppingOrderService.getSumAmount(); + map.put("shopAmount",data1); + BigDecimal data2 = vipOrderService.getSumAmout(); + map.put("vipAmount",data2); + }else{ + map.put("parkingAmount",0); + map.put("shopAmount",0); + map.put("vipAmount",0); } - map.put("parkingAmount",data); - BigDecimal data1 = shoppingOrderService.getSumAmount(); - map.put("shopAmount",data1); - 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).list(); + .eq(TChargingOrder::getRechargePaymentStatus, 2).in(TChargingOrder::getSiteId, siteIds).list(); BigDecimal sharingAmount = BigDecimal.ZERO; BigDecimal commissionAmount = BigDecimal.ZERO; //计算list中electrovalence的总和 @@ -2360,4 +2379,55 @@ public R addChargingOrderSummaryData(){ return chargingOrderService.addChargingOrderSummaryData(); } + + /** + * 充电桩数据大屏 新能源汽车电池安全检测次数统计 + */ + @ResponseBody + @GetMapping(value = "/getStatisticsOfBattery") + @ApiOperation(value = "新能源汽车电池安全检测次数统计", tags = {"充电桩数据大屏"}) + public R<StatisticsOfBatteryVO> getStatisticsOfBattery(){ + + return chargingOrderService.getStatisticsOfBattery(); + } + + /** + * 充电桩数据大屏 获取站点集合中总的充电量 + */ + @GetMapping("/getSumDegreeBySiteIds") + public R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds){ + return R.ok(chargingOrderService.getSumDegreeBySiteIds(SiteIds)); + } + + + @GetMapping(value = "/getOrderIdByUserId") + @ApiOperation(value = "H5查询当前用户正在充电中的订单id集合", tags = {"H5-首页-用户充电订单信息"}) + public R<String> getOrderIdByUserId() { + Long userId = tokenService.getLoginUserApplet().getUserId(); + TChargingOrder chargingOrder = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class) + .eq(TChargingOrder::getAppUserId, userId) + .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4)) + .orderByDesc(TChargingOrder::getCreateTime) + .last("LIMIT 1")); + if(Objects.isNull(chargingOrder)){ + return R.ok(); + } + return R.ok(String.valueOf(chargingOrder.getId())); + } + +// @GetMapping(value = "/getOrderByCode") +// @ApiOperation(value = "H5通过编号查询订单", tags = {"H5-首页-用户充电订单信息"}) +// public R<String> getOrderByCode(@RequestParam("code") String code) { +// Long userId = tokenService.getLoginUserApplet().getUserId(); +// TChargingOrder chargingOrder = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class) +// .eq(TChargingOrder::getAppUserId, userId) +// .in(TChargingOrder::getStatus, Arrays.asList(1,2,3,4)) +// .orderByDesc(TChargingOrder::getCreateTime) +// .last("LIMIT 1")); +// if(Objects.isNull(chargingOrder)){ +// return R.ok(); +// } +// return R.ok(String.valueOf(chargingOrder.getId())); +// } + } -- Gitblit v1.7.1