From e0207d7029b4e90ea1e4efeab5c3c5591f0e59c3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 29 八月 2024 16:28:10 +0800
Subject: [PATCH] 申诉
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 207 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 51ec3ab..5fda815 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserCarClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
@@ -15,13 +16,22 @@
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.integration.api.feignClient.ChargingHandshakeClient;
+import com.ruoyi.integration.api.feignClient.SendMessageClient;
+import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
+import com.ruoyi.integration.api.model.ChargingHandshake;
+import com.ruoyi.integration.api.model.PlatformStartCharging;
+import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
+import com.ruoyi.order.api.model.TChargingOrderRefund;
+import com.ruoyi.order.api.model.TOrderEvaluate;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TCharingOrderVO;
@@ -29,19 +39,25 @@
import com.ruoyi.order.mapper.TChargingOrderMapper;
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import com.ruoyi.order.service.TChargingOrderService;
+import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.*;
import io.seata.spring.annotation.GlobalTransactional;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -87,9 +103,21 @@
@Resource
private RedisService redisService;
+ @Resource
+ private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
+
+ @Resource
+ private ChargingHandshakeClient chargingHandshakeClient;
+
+ @Resource
+ private SendMessageClient sendMessageClient;
+
+ @Resource
+ private TOrderEvaluateService orderEvaluateService;
+
/**
* 获取小程序充电记录列表数据
* @param query
@@ -117,9 +145,14 @@
BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
myChargingOrderList.setPayMoney(payMoney);
myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ long count = orderEvaluateService.count(new LambdaQueryWrapper<TOrderEvaluate>().eq(TOrderEvaluate::getOrderType, 1)
+ .eq(TOrderEvaluate::getOrderId, tChargingOrder.getId()).eq(TOrderEvaluate::getDelFlag, 0));
+ myChargingOrderList.setEvaluate(count + 1L);
orderLists.add(myChargingOrderList);
}
+ list = this.baseMapper.getMyChargingOrderList(appUserId, query.getType(), null, null);
map.put("list", orderLists);
+ map.put("totle", list.size());
return map;
}
@@ -162,11 +195,39 @@
.orderByAsc(TChargingOrderAccountingStrategy::getStartTime)
);
myChargingOrderInfo.setStageCost(stageCost);
- // todo 待完善
- //再MongoDB中获取数据
- myChargingOrderInfo.setCurrentAndVoltage(null);
- //再MongoDB中获取数据
- myChargingOrderInfo.setPower(null);
+ List<UploadRealTimeMonitoringData> dataList = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
+ if(null != dataList){
+ //在MongoDB中获取数据
+ SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+ List<String> time = dataList.stream().map(s -> sdf.format(s.getCreate_time())).collect(Collectors.toList());
+ List<BigDecimal> outputVoltage = dataList.stream().map(UploadRealTimeMonitoringData::getOutput_voltage).collect(Collectors.toList());
+ List<BigDecimal> outputCurrent = dataList.stream().map(UploadRealTimeMonitoringData::getOutput_current).collect(Collectors.toList());
+ List<Map<String, Object>> currentAndVoltage = new ArrayList<>();
+ for (int i = 0; i < time.size(); i++) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("time", time.get(i));
+ //电流
+ map.put("electricity", outputCurrent.get(i));
+ //电压
+ map.put("voltage", outputVoltage.get(i));
+ currentAndVoltage.add(map);
+ }
+ myChargingOrderInfo.setCurrentAndVoltage(currentAndVoltage);
+ //在MongoDB中获取数据
+ List<Integer> soc = dataList.stream().map(UploadRealTimeMonitoringData::getSoc).collect(Collectors.toList());
+ List<BigDecimal> po = dataList.stream().map(s -> s.getOutput_current().multiply(s.getOutput_voltage()).divide(new BigDecimal(1000))).collect(Collectors.toList());
+ List<Map<String, Object>> power = new ArrayList<>();
+ for (int i = 0; i < time.size(); i++) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("time", time.get(i));
+ //soc
+ map.put("soc", soc.get(i));
+ //功率
+ map.put("power", po.get(i));
+ power.add(map);
+ }
+ myChargingOrderInfo.setPower(power);
+ }
myChargingOrderInfo.setActionable(myChargingOrderInfo.getEndTime() + 604800000L > System.currentTimeMillis() ? 0 : 1);
return myChargingOrderInfo;
}
@@ -195,6 +256,8 @@
BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
myChargingOrderList.setPayMoney(payMoney);
myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ myChargingOrderList.setElectricCharge(tChargingOrder.getElectrovalence());
+ myChargingOrderList.setServiceCharge(tChargingOrder.getServiceCharge());
list.add(myChargingOrderList);
}
return list;
@@ -368,10 +431,25 @@
preChargeCheck.setSecureConnectionDetection(false);
String key = "AQJC_" + chargingOrder.getChargingGunId();
redisService.setCacheObject(key, preChargeCheck);
- //开始检测充电桩状，将检查状态写入缓存。检测完成后开始开启充电
- //充电结束后需要计算退款剩余金额
- // todo 需要完善
+ //根据当前充值的金额和计费模板算出充电的金额
+ BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
+ //计算充电金额，会员需要将折扣金额加入到充电总金额中
+
+// TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
+// if(){
+// appUser.getVipId()
+// }
+//
+//
+// //调用远程启动充电消息
+// PlatformStartCharging platformStartCharging = new PlatformStartCharging();
+// platformStartCharging.setTransaction_serial_number(chargingOrder.getCode());
+// platformStartCharging.setCharging_pile_code();
+// platformStartCharging.setCharging_gun_code();
+// platformStartCharging.setCard_number();
+// platformStartCharging.setAccount_balance()
+// sendMessageClient.platformStartCharging(platformStartCharging);
return AjaxResult.success();
}
@@ -389,7 +467,6 @@
if(null == one){
return null;
}
- // todo 需要完善充电实时数据
ChargingDetails chargingDetails = new ChargingDetails();
chargingDetails.setId(one.getId().toString());
TChargingGun chargingGun = chargingGunClient.getChargingGunById(id).getData();
@@ -398,6 +475,27 @@
chargingDetails.setName(site.getName() + "-" + chargingPile.getName());
chargingDetails.setCode(one.getCode());
chargingDetails.setStatus(one.getStatus());
+ UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(one.getCode()).getData();
+ if(null != data){
+ chargingDetails.setChargeCurrent(data.getOutput_current());
+ chargingDetails.setChargeVoltage(data.getOutput_voltage());
+ BigDecimal power = data.getOutput_current().multiply(data.getOutput_voltage()).divide(new BigDecimal(1000));
+ chargingDetails.setChargePower(power);
+ chargingDetails.setCompletionRatio(data.getSoc());
+ chargingDetails.setRemainingChargeTime(data.getTime_remaining());
+ chargingDetails.setChargedDegrees(data.getCharging_degree());
+ chargingDetails.setChargedTime(data.getCumulative_charging_time());
+ chargingDetails.setChargingCost(data.getPaid_amount());
+ }
+ ChargingHandshake chargingHandshake = chargingHandshakeClient.getDataByOrderCode(one.getCode()).getData();
+ if(null != chargingHandshake && null != data && null != one.getAppUserCarId()){
+ BigDecimal bms_battery_capacity = chargingHandshake.getBms_battery_capacity();
+ TAppUserCar appUserCar = appUserCarClient.getCarByIds(Arrays.asList(one.getAppUserCarId())).getData().get(0);
+ // 续航 = 电池容量 / 续航里程 * soc
+ BigDecimal divide = bms_battery_capacity.divide(new BigDecimal(appUserCar.getEndurance()));
+ BigDecimal multiply = new BigDecimal(data.getSoc() / 100).multiply(divide);
+ chargingDetails.setEndurance(multiply);
+ }
return chargingDetails;
}
@@ -418,14 +516,27 @@
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
//调用硬件停止充电，停止成功后开始计算费用退款
+
+
+
// todo 待完善
return AjaxResult.success();
}
+
+
+ public void endCharge(){
+
+ }
+
+
+
@Override
public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {
TCharingOrderVO tCharingOrderVO = new TCharingOrderVO();
+
+
String startTime1 = null;
String startTime2 = null;
String endTime1 = null;
@@ -441,18 +552,103 @@
endTime1 = split[0];
endTime2 = split[1];
}
+ PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
+
if (StringUtils.hasLength(dto.getPhone())){
List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
if (data.isEmpty()){
- data.add(0L);
+ tCharingOrderVO.setList(pageInfo);
+ return tCharingOrderVO;
}
dto.setUserIds(data);
}
- PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<ChargingOrderVO> list = this.baseMapper.chargingOrder(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);
+ BigDecimal total = new BigDecimal("0");
+ long time = 0L;
+ BigDecimal income = new BigDecimal("0");
+ BigDecimal electronicMoney = new BigDecimal("0");
+ BigDecimal serviceMoney = new BigDecimal("0");
+ for (ChargingOrderVO chargingOrderVO : list) {
+ if (chargingOrderVO.getChargingCapacity()!=null){
+ total = total.add(chargingOrderVO.getChargingCapacity());
+ }
+ // 充电订单 明细记录
+ List<TChargingOrderAccountingStrategy> chargingOrderId = chargingOrderAccountingStrategyService.list(new QueryWrapper<TChargingOrderAccountingStrategy>()
+ .eq("charging_order_id", chargingOrderVO.getId()));
+ // 单个订单累计电费
+ BigDecimal electronicMoney1 = new BigDecimal("0");
+ // 单个订单累计服务费
+ BigDecimal serviceMoney1 = new BigDecimal("0");
+ LocalDateTime startTime = chargingOrderVO.getStartTime();
+ LocalDateTime endTime = chargingOrderVO.getEndTime();
+ // 计算时间差 秒 充电时长
+ if (startTime!=null && endTime!=null){
+ long between = ChronoUnit.SECONDS.between(startTime, endTime);
+ chargingOrderVO.setChargingSecond(between);
+ time += between;
+ }
+ // 总收入
+ if (chargingOrderVO.getRefundStatus() !=null && chargingOrderVO.getRefundStatus() == 2){
+ income = income.add(chargingOrderVO.getPaymentAmount().subtract(chargingOrderVO.getRefundAmount()));
+ }else{
+ if (chargingOrderVO.getPaymentAmount()!=null){
+ income = income.add(chargingOrderVO.getPaymentAmount());
+ }
+ }
+ for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : chargingOrderId) {
+ // 累计电费
+ electronicMoney1 = electronicMoney1.add(tChargingOrderAccountingStrategy.getElectrovalence()
+ .multiply(tChargingOrderAccountingStrategy.getChargingCapacity()));
+ electronicMoney = electronicMoney.add(electronicMoney1);
+ // 累计服务费
+ serviceMoney1 = serviceMoney1.add(tChargingOrderAccountingStrategy.getServiceCharge());
+ serviceMoney = serviceMoney.add(serviceMoney1);
+ }
+ chargingOrderVO.setServiceCharge(serviceMoney1);
+ chargingOrderVO.setElectrovalence(electronicMoney1);
+ // 充电时段数
+ int size = chargingOrderId.size();
+ chargingOrderVO.setCount(size);
+ // 用户手机号
+ TAppUser data = appUserClient.getUserById(chargingOrderVO.getAppUserId()).getData();
+ if (data!=null){
+ // 车牌号
+ chargingOrderVO.setPhone(data.getPhone());
+ List<Long> longs = new ArrayList<>();
+ if (chargingOrderVO.getAppUserCarId()!=null){
+ longs.add(chargingOrderVO.getAppUserCarId());
+ List<TAppUserCar> data1 = appUserCarClient.getCarByIds(longs).getData();
+ if (!data1.isEmpty()){
+ chargingOrderVO.setLicensePlate(data1.get(0).getLicensePlate());
+ }
+ }
+ }
+ }
+ tCharingOrderVO.setTotal(total);
+ tCharingOrderVO.setTime(time);
+ tCharingOrderVO.setIncome(income);
+ tCharingOrderVO.setElectronicMoney(electronicMoney);
+ tCharingOrderVO.setServiceMoney(serviceMoney);
pageInfo.setRecords(list);
tCharingOrderVO.setList(pageInfo);
return tCharingOrderVO;
}
+
+ @Override
+ public R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto) {
+ PageInfo<PayOrderDto> pageInfo = new PageInfo<>(payOrderQueryDto.getPageCurr(),payOrderQueryDto.getPageSize());
+ List<PayOrderDto> list = this.baseMapper.payOrderQuery(pageInfo,payOrderQueryDto);
+ pageInfo.setRecords(list);
+ return R.ok(pageInfo);
+ }
+
+ @Override
+ public R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto) {
+ PageInfo<TChargingOrderRefund> pageInfo = new PageInfo<>(chargingRefundDto.getPageCurr(),chargingRefundDto.getPageSize());
+ List<TChargingOrderRefund> list = this.baseMapper.getRefundList(pageInfo,chargingRefundDto);
+ pageInfo.setRecords(list);
+
+ return R.ok(pageInfo);
+ }
}
--
Gitblit v1.7.1