From 03adfbce477422cd24c715a6f9c5589b0cf014f2 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 25 五月 2026 15:35:33 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 627 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 359 insertions(+), 268 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 5029cfd..d7fc008 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.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import java.math.BigDecimal;
@@ -23,19 +24,15 @@
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.web.domain.BasePojo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.log.enums.OperatorType;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.annotation.Logical;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
-import com.ruoyi.integration.api.model.PageChargingOrderAndUploadRealTimeMonitoringDataDto;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
-import com.ruoyi.integration.api.model.ChargingOrderAndUploadRealTimeMonitoringDataDto;
-import com.ruoyi.integration.api.model.UploadRealTimeMonitoringPageData;
import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
@@ -54,13 +51,15 @@
import com.ruoyi.order.dto.*;
import com.ruoyi.order.service.*;
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.UpdateOrderPaymentAmountDto;
import com.ruoyi.order.vo.WatchChargingOrderVo;
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;
@@ -73,11 +72,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;
@@ -145,7 +140,7 @@
@Resource
private TOrderInvoiceService invoiceService;
@Resource
- private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+ private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
@Resource
private PartnerClient partnerClient;
@Resource
@@ -216,55 +211,7 @@
@PostMapping(value = "/pay/order/list")
@ApiOperation(value = "列表", tags = {"管理后台-支付订单-订单信息"})
public R<PageInfo<PayOrderDto>> payOrderList(@RequestBody PayOrderQueryDto payOrderQueryDto) {
- Integer pageCurr = payOrderQueryDto.getPageCurr();
- Integer pageSize = payOrderQueryDto.getPageSize();
- payOrderQueryDto.setPageCurr(1);
- payOrderQueryDto.setPageSize(10000999);
- PageInfo<PayOrderDto> data = chargingOrderService.payOrderQuery(payOrderQueryDto).getData();
- List<PayOrderDto> res = new ArrayList<>();
- // 查询当前登陆人按钮权限
- SysUser sysUser = sysUserClient.getSysUser(tokenService.getLoginUser().getUserid()).getData();
- Integer roleType = sysUser.getRoleType();
- Long userId = tokenService.getLoginUser().getUserid();
- //如果没传siteId,获取当前登陆人所有的siteIds
- List<Integer> siteIds = new ArrayList<>();
- if (userId != null){
- List<GetSiteListDTO> data2 = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data2) {
- siteIds.add(datum.getId());
- }
- }
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }
- List<TChargingOrder> list = chargingOrderService.list();
- List<TParkingRecord> parkingRecord = parkingLotClient.getSiteIdAll().getData();
- for (PayOrderDto record : data.getRecords()) {
- if (record.getType() == 1){
- TChargingOrder chargingOrder = list.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
- if (chargingOrder!=null){
- record.setSiteId(chargingOrder.getSiteId());
- }
- }
- if (record.getType()==4){
- TParkingRecord tParkingRecord = parkingRecord.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
- if (tParkingRecord!=null){
- record.setSiteId(tParkingRecord.getSiteId());
- }
- }
- if (roleType==1||(record.getType()!=1&&record.getType()!=4)){
- res.add(record);
- continue;
- }
- if (roleType==2 && (record.getType()==1||record.getType()==4) && siteIds.contains(record.getSiteId())){
- res.add(record);
- }
-
- }
- List<PayOrderDto> res1 = testing5(res.size(), pageCurr, pageSize, res);
- data.setTotal(res.size());
- data.setRecords(res1);
- return R.ok(data);
+ return chargingOrderService.payOrderQuery(payOrderQueryDto);
}
@@ -319,6 +266,11 @@
payOrderInfoDto.setRefundAmount(byId.getRefundAmount());
payOrderInfoDto.setRechargeAmount(byId.getRechargeAmount());
payOrderInfoDto.setFinalAmount(byId.getRechargeAmount().subtract(byId.getRefundAmount()));
+ payOrderInfoDto.setPayMethod(byId.getPayMethod());
+ payOrderInfoDto.setBalancePayAmount(byId.getBalancePayAmount());
+ payOrderInfoDto.setThirdPayAmount(byId.getThirdPayAmount());
+ payOrderInfoDto.setBalanceRefundAmount(byId.getBalanceRefundAmount());
+ payOrderInfoDto.setThirdRefundAmount(byId.getThirdRefundAmount());
return R.ok(payOrderInfoDto);
case 2:
TShoppingOrder byId1 = shoppingOrderService.getById(orderId);
@@ -399,17 +351,12 @@
payOrderChargingInfo.setChargingName(data1.getName());
TChargingGun data2 = chargingGunClient.getChargingGunById(byId.getChargingGunId()).getData();
payOrderChargingInfo.setGunName(data2.getName());
- if (byId.getAppUserCarId()!=null) {
- List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(byId.getAppUserCarId())).getData();
- payOrderChargingInfo.setCarNum(data3.get(0).getLicensePlate());
- }else{
- payOrderChargingInfo.setCarNum(byId.getPlateNum());
- }
+ payOrderChargingInfo.setCarNum(byId.getPlateNum());
payOrderChargingInfo.setTChargingOrder(byId);
Long count = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).count();
payOrderChargingInfo.setPeriodCount(count);
- if (byId.getAppUserCarId()!=null) {
+ if (byId.getAppUserCarId()!=null && 0 != byId.getAppUserCarId()) {
List<Long> carid = new ArrayList<>();
carid.add(byId.getAppUserCarId());
R<List<TAppUserCar>> carByIds = appUserCarClient.getCarByIds(carid);
@@ -572,6 +519,16 @@
}
+ @RequiresPermissions(value = {"/chargingPileOrder"}, logical = Logical.OR)
+ @ResponseBody
+ @PostMapping(value = "/balanceIncomeDetail")
+ @ApiOperation(value = "充电桩订单余额收入明细", tags = {"管理后台-订单管理"})
+ public AjaxResult<List<ChargingOrderBalanceIncomeDetailVO>> balanceIncomeDetail(@RequestBody ChargingOrderQuery dto) {
+ List<ChargingOrderBalanceIncomeDetailVO> res = chargingOrderService.balanceIncomeDetail(dto);
+ return AjaxResult.success(res);
+ }
+
+
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -607,15 +564,18 @@
}
tChargingOrderAccountingStrategy.setStartTime(format+" "+tChargingOrderAccountingStrategy.getStartTime());
tChargingOrderAccountingStrategy.setEndTime(format+" "+tChargingOrderAccountingStrategy.getEndTime());
- if (byId.getVipDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
- BigDecimal multiply = byId.getVipDiscountAmount().divide(byId.getServiceCharge(), 2)
- .multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
- tChargingOrderAccountingStrategy.setVipDiscount(multiply);
- }
- if (byId.getCouponDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
- BigDecimal multiply = byId.getCouponDiscountAmount().divide(byId.getServiceCharge(), 2)
- .multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
- tChargingOrderAccountingStrategy.setCouponDiscount(multiply);
+// if (byId.getVipDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
+// BigDecimal multiply = byId.getVipDiscountAmount().divide(byId.getServiceCharge(), 2)
+// .multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
+// tChargingOrderAccountingStrategy.setVipDiscount(multiply);
+// }
+// if (byId.getCouponDiscountAmount()!=null && byId.getServiceCharge().compareTo(BigDecimal.ZERO) != 0){
+// BigDecimal multiply = byId.getCouponDiscountAmount().divide(byId.getServiceCharge(), 2)
+// .multiply(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
+// tChargingOrderAccountingStrategy.setCouponDiscount(multiply);
+// }
+ if(null == tChargingOrderAccountingStrategy.getCouponDiscount()){
+ tChargingOrderAccountingStrategy.setCouponDiscount(BigDecimal.ZERO);
}
}
//从新排序
@@ -638,10 +598,11 @@
chargingOrderInfoVO.setList(list);
return AjaxResult.success(chargingOrderInfoVO);
}
-
+
+ @Log(title = "【扫一扫】添加评价", businessType = BusinessType.INSERT,operatorType = OperatorType.MOBILE)
@ResponseBody
@PostMapping(value = "/addEvaluate")
@ApiOperation(value = "添加评价", tags = {"小程序-扫一扫"})
@@ -794,7 +755,7 @@
}
-
+ @Log(title = "【扫一扫】支付充电充值费用", businessType = BusinessType.UPDATE,operatorType = OperatorType.MOBILE)
@ResponseBody
@PostMapping(value = "/paymentChargingOrder")
@ApiOperation(value = "支付充电充值费用", tags = {"小程序-扫一扫"})
@@ -847,7 +808,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);
+ }
+
/**
*
@@ -859,6 +830,19 @@
chargingOrderService.refund(code);
return R.ok();
}
+
+
+ /**
+ *
+ * @param code
+ */
+ @ResponseBody
+ @PostMapping(value = "/refund1")
+ public R refund1(@RequestParam(value = "code") String code, @RequestParam(value = "money") BigDecimal money){
+ chargingOrderService.refund1(code, money);
+ return R.ok();
+ }
+
/**
@@ -875,8 +859,7 @@
-
-
+
@ResponseBody
@GetMapping(value = "/preChargeCheck/{id}")
@ApiOperation(value = "获取安全检测数据", tags = {"小程序-扫一扫"})
@@ -888,7 +871,6 @@
Object cacheObject = redisService.getCacheObject(key);
return AjaxResult.success(cacheObject);
}
-
@ResponseBody
@@ -903,6 +885,8 @@
}
+
+ @Log(title = "【扫一扫】手动停止充电", businessType = BusinessType.STOP,operatorType = OperatorType.MOBILE)
@ResponseBody
@PutMapping(value = "/stopCharging/{id}")
@ApiOperation(value = "手动停止充电", tags = {"小程序-扫一扫"})
@@ -910,6 +894,7 @@
@ApiImplicitParam(name = "id", value = "订单id", required = true)
})
public AjaxResult stopCharging(@PathVariable String id) {
+ log.info("小程序主动发起停止充电，订单ID：{}", id);
return chargingOrderService.stopCharging(id);
}
@@ -945,19 +930,8 @@
@ApiOperation(value = "电站收入分析", tags = {"后台-数据分析-平台收入分析"})
public R<List<SixChargingDto>> charge(Integer siteId) {
Long userId = tokenService.getLoginUser().getUserid();
- //如果没传siteId,获取当前登陆人所有的siteIds
- List<Integer> siteIds = new ArrayList<>();
- if (siteId==null){
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
- }else {
- siteIds.add(siteId);
- }
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId);
LocalDate sixBefore = PreviousSixMonths.get();
//通过siteIds进行sql查询统计
List<SixChargingDto> sixChargingDtos = generateLastSixMonths();
@@ -998,17 +972,9 @@
@ApiOperation(value = "电站收入占比", tags = {"后台-数据分析-平台收入分析"})
public R<List<SixCircleDto>> circle() {
Long userId = tokenService.getLoginUser().getUserid();
- //获取当前登录的siteIds
- List<Integer> siteIds = new ArrayList<>();
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
- //进行统计groupBySiteId
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
LocalDate sixBefore = PreviousSixMonths.get();
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }
List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore);
for (SixCircleDto sixCircleDto : sixCircleDtos) {
Site site = siteClient.getSiteByIds(Arrays.asList(sixCircleDto.getSiteId())).getData().get(0);
@@ -1083,7 +1049,9 @@
-
+ /**
+ * 查询平台收入分析底部数据分类，充电订单金额由数据库聚合，避免全量订单和计费明细加载超时。
+ */
@RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/six/total")
@@ -1091,53 +1059,67 @@
public R<Map<String,Object>> total() {
//count近6个月的数据
Long userId = tokenService.getLoginUser().getUserid();
- //获取当前登录的siteIds
- List<Integer> siteIds = new ArrayList<>();
- List<GetSiteListDTO> data9 = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data9) {
- siteIds.add(datum.getId());
- }
- //进行统计groupBySiteId
- if (siteIds.isEmpty()){
- siteIds.add(-1);
- }
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
Map<String,Object> map = chargingOrderService.countAll(siteIds);
- BigDecimal data = parkingLotClient.getRecordAmount().getData();
- if (map ==null){
- map = new HashMap<String,Object>();
+ boolean platformVisible = 1 == sysUser.getObjectId();
+ if(platformVisible){
+ 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();
- BigDecimal sharingAmount = BigDecimal.ZERO;
- BigDecimal commissionAmount = BigDecimal.ZERO;
- //计算list中electrovalence的总和
- BigDecimal totalElectrovalence = BigDecimal.ZERO;
- //计算list中serviceCharge的总和
- BigDecimal totalServiceCharge = BigDecimal.ZERO;
- List<TChargingOrderAccountingStrategy> accountingStrategyList = chargingOrderAccountingStrategyService.list();
- for (TChargingOrder order : list) {
- List<TChargingOrderAccountingStrategy> collect = accountingStrategyList.stream().filter(s -> s.getChargingOrderId().equals(order.getId())).collect(Collectors.toList());
- 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);
- 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")));
+ map.put("platformIncomeVisible", platformVisible);
+ return R.ok(map);
+ }
+
+ @RequiresPermissions(value = {"/platformRevenueAnalysis"}, logical = Logical.OR)
+ @ResponseBody
+ @GetMapping(value = "/six/pay-type-circle")
+ @ApiOperation(value = "收入类型占比", tags = {"后台-数据分析-平台收入分析"})
+ public R<List<SixIncomeCircleDto>> payTypeCircle() {
+ Long userId = tokenService.getLoginUser().getUserid();
+ SysUser sysUser = sysUserClient.getSysUser(userId).getData();
+ List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, null);
+ LocalDate sixBefore = PreviousSixMonths.get();
+ return R.ok(chargingOrderService.payTypeCircle(sixBefore, siteIds));
+ }
+
+ /**
+ * 解析平台收入分析页面允许查看的站点范围。
+ * 合作商使用授权站点，其他后台账号沿用用户站点列表；传入站点时需做授权校验。
+ */
+ private List<Integer> resolvePlatformRevenueSiteIds(Long userId, SysUser sysUser, Integer siteId) {
+ List<Integer> siteIds = new ArrayList<>();
+ if (sysUser != null && Integer.valueOf(2).equals(sysUser.getRoleType())) {
+ Set<Integer> authSiteIds = partnerClient.authSite(sysUser.getObjectId(), SiteMenu.SITE_LIST.getValue()).getData();
+ if (authSiteIds != null) {
+ siteIds.addAll(authSiteIds);
+ }
+ } else {
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ if (data != null) {
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
+ }
}
}
- map.put("service_charge",totalServiceCharge.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- map.put("electrovalence",totalElectrovalence.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- map.put("commission_amount",commissionAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- map.put("sharing_amount",sharingAmount.setScale(2, BigDecimal.ROUND_HALF_EVEN));
- return R.ok(map);
+ if (siteId != null) {
+ return siteIds.contains(siteId) ? Collections.singletonList(siteId) : Collections.singletonList(-1);
+ }
+ if (siteIds.isEmpty()) {
+ siteIds.add(-1);
+ }
+ return siteIds;
}
@@ -1228,7 +1210,7 @@
@GetMapping(value = "/watch/deletes")
@ApiOperation(value = "监控订单-删除", tags = {"管理后台-订单管理"})
public R watchChargingOrder(@RequestParam String id) {
- uploadRealTimeMonitoringDataClient.delete(id);
+ uploadRealTimeMonitoringDataService.delete(id);
return R.ok();
}
@@ -1247,8 +1229,10 @@
*/
@PostMapping(value = "/getOrderByCode/{code}")
public R<TChargingOrder> getOrderByCode(@PathVariable("code") String code){
- return R.ok(chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
- .eq(TChargingOrder::getCode,code)));
+ TChargingOrder one = chargingOrderService.getOne(Wrappers.lambdaQuery(TChargingOrder.class)
+ .eq(TChargingOrder::getCode, code));
+ one.setIdStr(one.getId().toString());
+ return R.ok(one);
}
@@ -1292,7 +1276,6 @@
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
}else if (statisticsQueryDto.getDayType()==5){
- // 获取今年1月1日的日期
start = statisticsQueryDto.getStartTime();
end = statisticsQueryDto.getEndTime();
if (start.equals(end)){
@@ -1457,7 +1440,10 @@
BigDecimal commissionAmount = BigDecimal.ZERO;
for (Map<String, Object> map : maps) {
BigDecimal periodElectricPrice = (BigDecimal) map.get("period_electric_price");
- allMoney = allMoney.add(periodElectricPrice);
+ Long order_source = (Long)map.get("order_source");
+ if(2 != order_source){
+ allMoney = allMoney.add(periodElectricPrice);
+ }
BigDecimal total_amount = (BigDecimal) map.get("total_amount");
allMoney = allMoney.add(total_amount);
commissionAmount = commissionAmount.add((BigDecimal) map.get("commissionAmount"));
@@ -1875,16 +1861,10 @@
} else {
siteIds.add(statisticsQueryDto.getSiteId());
}
- LocalDateTime selectDate = statisticsQueryDto.getSelectDate();
- LocalDateTime min = selectDate.with(LocalTime.MIN);
- 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).eq(TChargingOrder::getDelFlag, 0)
- .eq(TChargingOrder::getRechargePaymentStatus, 2)
- .eq(statisticsQueryDto.getSiteId() != null, TChargingOrder::getSiteId, statisticsQueryDto.getSiteId()).list();
+ String format = statisticsQueryDto.getSelectDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Map<String, Object> stringObjectMap = chargingOrderService.getChargingOrderCount(siteIds, format);
//当日的订单总数
- int size = list.size();
+ int size = 0;
//计算list中paymentAmount的总和
BigDecimal totalPaymentAmount = BigDecimal.ZERO;
//计算list中electrovalence的总和
@@ -1893,21 +1873,12 @@
BigDecimal totalServiceCharge = BigDecimal.ZERO;
//计算list中charging_capacity的总和
BigDecimal totalChargingCapacity = BigDecimal.ZERO;
- List<TChargingOrderAccountingStrategy> accountingStrategyList = chargingOrderAccountingStrategyService.list();
- for (TChargingOrder order : list) {
- List<TChargingOrderAccountingStrategy> collect = accountingStrategyList.stream().filter(s -> s.getChargingOrderId().equals(order.getId())).collect(Collectors.toList());
- BigDecimal periodElectricPrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodElectricPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal periodServicePrice = collect.stream().map(TChargingOrderAccountingStrategy::getPeriodServicePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal chargingCapacity = collect.stream().map(TChargingOrderAccountingStrategy::getChargingCapacity).reduce(BigDecimal.ZERO, BigDecimal::add);
- totalElectrovalence = totalElectrovalence.add(periodElectricPrice);
- totalChargingCapacity = totalChargingCapacity.add(chargingCapacity);
- if(2 != order.getOrderSource()){
- totalServiceCharge = totalServiceCharge.add(periodServicePrice);
- totalPaymentAmount = totalPaymentAmount.add(periodElectricPrice).add(periodServicePrice);
- }else{
- totalServiceCharge = totalServiceCharge.add(periodServicePrice.multiply(new BigDecimal("0.8")));
- totalPaymentAmount = totalPaymentAmount.add(periodElectricPrice).add(periodServicePrice.multiply(new BigDecimal("0.8")));
- }
+ if(null != stringObjectMap){
+ size = Integer.parseInt(stringObjectMap.get("num").toString());
+ totalElectrovalence = new BigDecimal(stringObjectMap.get("electrovalence").toString());
+ totalServiceCharge = new BigDecimal(stringObjectMap.get("servicecharge").toString());
+ totalChargingCapacity = new BigDecimal(stringObjectMap.get("electricity").toString());
+ totalPaymentAmount = totalElectrovalence.add(totalServiceCharge);
}
TCharingWorkVO tCharingWorkVO = new TCharingWorkVO();
@@ -1926,100 +1897,104 @@
@PostMapping(value = "/work/chargeDetail")
@ApiOperation(value = "运营情况", tags = {"管理后台-工作台"})
public R workCharge(@RequestBody ChargingDetailQueryDto statisticsQueryDto) {
- List<Integer> siteIds = new ArrayList<>();
- if (statisticsQueryDto.getSiteId() == null) {
- Long userId = tokenService.getLoginUser().getUserid();
- //获取当前登录的siteIds
- List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
- for (GetSiteListDTO datum : data) {
- siteIds.add(datum.getId());
- }
- } else {
- siteIds.add(statisticsQueryDto.getSiteId());
- }
- if (statisticsQueryDto.getDayType()==1) {
- List<Map<String,Object>> charMap1 = chargingOrderService.getHourType(siteIds,statisticsQueryDto);
- List<Map<String, Object>> charMap = new ArrayList<>();
- // 生成从 "00:00" 到 "23:00" 的时间数据
- for (int hour = 0; hour < 24; hour++) {
- String time = String.format("%02d:00", hour);
- Map<String, Object> mapWithTimeValue = findMapWithTimeValue(charMap1, time);
- if (mapWithTimeValue!=null){
- charMap.add(mapWithTimeValue);
- }else {
- Map<String, Object> timeMap = new HashMap<>();
- timeMap.put("time", time); // 初始化值为 null
- timeMap.put("electrovalence", 0);
- timeMap.put("orderCount", 0);
- timeMap.put("servicecharge", 0);
- timeMap.put("electricity", 0);
- charMap.add(timeMap);
+ try {
+ List<Integer> siteIds = new ArrayList<>();
+ if (statisticsQueryDto.getSiteId() == null) {
+ Long userId = tokenService.getLoginUser().getUserid();
+ //获取当前登录的siteIds
+ List<GetSiteListDTO> data = siteClient.getSiteListByUserId(userId).getData();
+ for (GetSiteListDTO datum : data) {
+ siteIds.add(datum.getId());
}
+ } else {
+ siteIds.add(statisticsQueryDto.getSiteId());
}
- return R.ok(charMap);
- }else if (statisticsQueryDto.getDayType()==2){
- // 假设 chargingOrderService.getDateType() 返回的是按天的数据
- List<Map<String, Object>> charMap1 = chargingOrderService.getDateType(siteIds, statisticsQueryDto);
-
- // 解析 startTime 和 endTime 为 LocalDate
- LocalDate startDate = statisticsQueryDto.getStartTime();
- LocalDate endDate = statisticsQueryDto.getEndTime();
-
- List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
-
- // 遍历日期范围
- while (!startDate.isAfter(endDate)) {
- String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
- Map<String, Object> dailyStats = findMapWithDateValue(charMap1, formattedDate);
-
- if (dailyStats != null) {
- dateRangeStatistics.add(dailyStats);
- } else {
- Map<String, Object> dateMap = new HashMap<>();
- dateMap.put("time", formattedDate);
- dateMap.put("electrovalence", 0);
- dateMap.put("orderCount", 0);
- dateMap.put("servicecharge", 0);
- dateMap.put("electricity", 0);
- dateRangeStatistics.add(dateMap);
+ if (statisticsQueryDto.getDayType()==1) {
+ List<Map<String,Object>> charMap1 = chargingOrderService.getHourType(siteIds,statisticsQueryDto);
+ List<Map<String, Object>> charMap = new ArrayList<>();
+ // 生成从 "00:00" 到 "23:00" 的时间数据
+ for (int hour = 0; hour < 24; hour++) {
+ String time = String.format("%02d:00", hour);
+ Map<String, Object> mapWithTimeValue = findMapWithTimeValue(charMap1, time);
+ if (mapWithTimeValue!=null){
+ charMap.add(mapWithTimeValue);
+ }else {
+ Map<String, Object> timeMap = new HashMap<>();
+ timeMap.put("time", time); // 初始化值为 null
+ timeMap.put("electrovalence", 0);
+ timeMap.put("orderCount", 0);
+ timeMap.put("servicecharge", 0);
+ timeMap.put("electricity", 0);
+ charMap.add(timeMap);
+ }
}
-
- // 移动到下一天
- startDate = startDate.plusDays(1);
- }
+ return R.ok(charMap);
+ }else if (statisticsQueryDto.getDayType()==2){
+ // 假设 chargingOrderService.getDateType() 返回的是按天的数据
+ List<Map<String, Object>> charMap1 = chargingOrderService.getDateType(siteIds, statisticsQueryDto);
+
+ // 解析 startTime 和 endTime 为 LocalDate
+ LocalDate startDate = statisticsQueryDto.getStartTime();
+ LocalDate endDate = statisticsQueryDto.getEndTime();
+
+ List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
+
+ // 遍历日期范围
+ while (!startDate.isAfter(endDate)) {
+ String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Map<String, Object> dailyStats = findMapWithDateValue(charMap1, formattedDate);
+
+ if (dailyStats != null) {
+ dateRangeStatistics.add(dailyStats);
+ } else {
+ Map<String, Object> dateMap = new HashMap<>();
+ dateMap.put("time", formattedDate);
+ dateMap.put("electrovalence", 0);
+ dateMap.put("orderCount", 0);
+ dateMap.put("servicecharge", 0);
+ dateMap.put("electricity", 0);
+ dateRangeStatistics.add(dateMap);
+ }
+
+ // 移动到下一天
+ startDate = startDate.plusDays(1);
+ }
// return dateRangeStatistics;
- return R.ok(dateRangeStatistics);
- }else if (statisticsQueryDto.getDayType()==3){
- List<Map<String,Object>> charMap1 = chargingOrderService.getMonthType(siteIds,statisticsQueryDto);
- // 解析 startTime 和 endTime 为 LocalDate
- LocalDate startDate = statisticsQueryDto.getStartTime();
- LocalDate endDate = statisticsQueryDto.getEndTime();
-
- List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
-
- // 遍历日期范围
- while (!startDate.isAfter(endDate)) {
- String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
- Map<String, Object> dailyStats = findMapWithDateValue(charMap1, formattedDate);
-
- if (dailyStats != null) {
- dateRangeStatistics.add(dailyStats);
- } else {
- Map<String, Object> dateMap = new HashMap<>();
- dateMap.put("time", formattedDate);
- dateMap.put("electrovalence", 0);
- dateMap.put("orderCount", 0);
- dateMap.put("servicecharge", 0);
- dateMap.put("electricity", 0);
- dateRangeStatistics.add(dateMap);
+ return R.ok(dateRangeStatistics);
+ }else if (statisticsQueryDto.getDayType()==3){
+ List<Map<String,Object>> charMap1 = chargingOrderService.getMonthType(siteIds,statisticsQueryDto);
+ // 解析 startTime 和 endTime 为 LocalDate
+ LocalDate startDate = statisticsQueryDto.getStartTime();
+ LocalDate endDate = statisticsQueryDto.getEndTime();
+
+ List<Map<String, Object>> dateRangeStatistics = new ArrayList<>();
+
+ // 遍历日期范围
+ while (!startDate.isAfter(endDate)) {
+ String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
+ Map<String, Object> dailyStats = findMapWithDateValue(charMap1, formattedDate);
+
+ if (dailyStats != null) {
+ dateRangeStatistics.add(dailyStats);
+ } else {
+ Map<String, Object> dateMap = new HashMap<>();
+ dateMap.put("time", formattedDate);
+ dateMap.put("electrovalence", 0);
+ dateMap.put("orderCount", 0);
+ dateMap.put("servicecharge", 0);
+ dateMap.put("electricity", 0);
+ dateRangeStatistics.add(dateMap);
+ }
+
+ // 移动到下一天
+ startDate = startDate.plusMonths(1);
}
-
- // 移动到下一天
- startDate = startDate.plusMonths(1);
+ return R.ok(dateRangeStatistics);
+
}
- return R.ok(dateRangeStatistics);
-
+ }catch (Exception e){
+ e.printStackTrace();
}
return R.ok();
@@ -2317,6 +2292,122 @@
return chargingOrderService.getNotPaymentChargingOrder();
}
-
+ /**
+ * 手动推送订单给三方平台
+ * @param code
+ * @return
+ */
+ @PostMapping("/pushOrderInfo")
+ public R pushOrderInfo(@RequestParam String code){
+ return chargingOrderService.pushOrderInfo(code);
+ }
+
+
+ /**
+ * 添加汇总数据（临时）
+ * @return
+ */
+ @ResponseBody
+ @GetMapping(value = "/addChargingOrderSummaryData")
+ public R addChargingOrderSummaryData(){
+ return chargingOrderService.addChargingOrderSummaryData();
+ }
+
+ /**
+ * 充电桩数据大屏 新能源汽车电池安全检测次数统计
+ */
+ @ResponseBody
+ @GetMapping(value = "/getStatisticsOfBattery")
+ @ApiOperation(value = "新能源汽车电池安全检测次数统计", tags = {"充电桩数据大屏"})
+ public R<StatisticsOfBatteryVO> getStatisticsOfBattery(){
+
+ return chargingOrderService.getStatisticsOfBattery();
+ }
+
+ /**
+ * 充电桩数据大屏 获取站点集合中总的充电量
+ */
+ @ResponseBody
+ @GetMapping("/getSumDegreeBySiteIds")
+ public R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds){
+ Double sumDegreeBySiteIds = chargingOrderService.getSumDegreeBySiteIds(SiteIds);
+
+ return R.ok(new BigDecimal(sumDegreeBySiteIds));
+ }
+ @ResponseBody
+ @PostMapping("/addChargingOrder")
+ public R<Long> addChargingOrder(@RequestBody TChargingOrder chargingOrder){
+ chargingOrderService.save(chargingOrder);
+ return R.ok(chargingOrder.getId());
+ }
+
+
+ @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()));
+ }
+
+
+ /**
+ * 手动查询订单和退款数据，完善退款记录
+ * @param orderId
+ * @param refund_out_trade_no
+ * @return
+ */
+ @PostMapping("/orderQueryRefund")
+ public R<?> orderQueryRefund(@RequestParam("orderId") Long orderId, @RequestParam("refund_out_trade_no") String refund_out_trade_no){
+ chargingOrderService.orderQueryRefund(orderId, refund_out_trade_no);
+ return R.ok();
+ }
+
+ /**
+ * 手动查询订单和退款数据，批量完善退款记录
+ * @return
+ */
+ @PostMapping("/orderQueryRefundList")
+ public R<?> orderQueryRefundList(@RequestBody List<String> dto){
+ for (String s : dto) {
+ String[] split = s.split(",");
+ chargingOrderService.orderQueryRefund(Long.valueOf(split[0]), split[1]);
+ }
+ return R.ok();
+ }
+
+
+ /**
+ * 手动添加完善订单费用明细
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/addOrderExpenseBreakdown")
+ public R<?> addOrderExpenseBreakdown(@RequestParam("orderId") Long orderId){
+ chargingOrderService.addOrderExpenseBreakdown(orderId);
+ return R.ok();
+ }
+
+
+ /**
+ * 手动批量修改订单支付金额
+ * @param dtos
+ * @return
+ */
+ @PostMapping("/updateOrderPaymentAmount")
+ public R<?> updateOrderPaymentAmount(@RequestBody List<UpdateOrderPaymentAmountDto> dtos){
+ for (UpdateOrderPaymentAmountDto dto : dtos) {
+ chargingOrderService.update(new UpdateWrapper<TChargingOrder>().eq("id", dto.getOrderId())
+ .set("payment_amount", dto.getPaymentAmount()));
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1