From 0a32ecc49bc4acd885096562e809381d28b3d1d7 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 14:37:31 +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/service/impl/TChargingOrderServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 95 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 be6aa3a..77bf7a4 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
@@ -30,6 +30,15 @@
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.common.security.utils.SecurityUtils;
+import com.ruoyi.integration.api.feignClient.ChargingHandshakeClient;
+import com.ruoyi.integration.api.feignClient.PlatformStartChargingReplyClient;
+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.PlatformStartChargingReply;
+import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.integration.api.feignClient.*;
import com.ruoyi.integration.api.model.*;
import com.ruoyi.integration.api.vo.GetPlatformStopChargingReply;
@@ -49,12 +58,17 @@
import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TGoods;
+import com.ruoyi.order.vo.ChargingOrderListInfoVO;
+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.model.RefundReq;
import com.ruoyi.payment.api.model.RefundResp;
import com.ruoyi.payment.api.model.WxPaymentRefundModel;
import com.ruoyi.payment.api.vo.*;
+import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import io.seata.spring.annotation.GlobalTransactional;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.BeanUtils;
@@ -938,8 +952,8 @@
BigDecimal electronicMoney1 = new BigDecimal("0");
// 单个订单累计服务费
BigDecimal serviceMoney1 = new BigDecimal("0");
- // todo 调用第三方获取充电时长 秒
-
+ UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderVO.getCode()).getData();
+ chargingOrderVO.setChargingSecond(data5.getTime_remaining()*60L);
// 总收入
if (chargingOrderVO.getRefundStatus() !=null && chargingOrderVO.getRefundStatus() == 2){
income = income.add(chargingOrderVO.getPaymentAmount().subtract(chargingOrderVO.getRefundAmount()));
@@ -1050,7 +1064,13 @@
public List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds) {
return this.baseMapper.getYearData(chargingOrderIds);
}
+ @Resource
+ private SysUserClient sysUserClient;
+ @Resource
+ private UserSiteClient userSiteClient;
+ @Resource
+ private RoleSiteClient roleSiteClient;
@Override
public ChargingOrderTimeVO chargingList(ChargingListQuery dto) {
String startTime1 = null;
@@ -1063,17 +1083,12 @@
startTime1 = split[0];
startTime2 = split[1];
}
- if (StringUtils.hasLength(dto.getEndTime())){
- String[] split = dto.getEndTime().split(" - ");
- endTime1 = split[0];
- endTime2 = split[1];
- }
ChargingOrderTimeVO chargingOrderTimeVO = new ChargingOrderTimeVO();
-
PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo,dto,startTime1,startTime2,endTime1,endTime2);
for (ChargingOrderListVO chargingOrderListVO : list) {
+ chargingOrderListVO.setUid(chargingOrderListVO.getId()+"");
List<Integer> integers = new ArrayList<>();
integers.add(chargingOrderListVO.getSiteId());
List<Site> data = siteClient.getSiteByIds(integers).getData();
@@ -1085,7 +1100,21 @@
if (data2 != null && data1 != null) {
chargingOrderListVO.setTerminalName(data2.getName() + "-" + data1.getName());
}
- // todo 充电时长 调用第三方获取
+ // 获取充电时间
+ UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderListVO.getCode()).getData();
+ if (data5!=null){
+ if (data5.getTime_remaining()!=null){
+ chargingOrderListVO.setChargingSecond(data5.getTime_remaining()*60L);
+
+ }
+ }
+ // 获取开始SOC 结束soc
+ List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrderListVO.getCode()).getData();
+ if (!data6.isEmpty()){
+ // 第一条数据soc为开始 最后一条数据soc为结束soc
+ chargingOrderListVO.setStartSoc(data6.get(0).getSoc().toString());
+ chargingOrderListVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+ }
TAppUser data3 = appUserClient.getUserById(chargingOrderListVO.getAppUserId()).getData();
List<Long> carId = new ArrayList<>();
if (chargingOrderListVO.getAppUserCarId() != null) {
@@ -1212,8 +1241,63 @@
chargingOrderTimeVO.setList(pageInfo);
return chargingOrderTimeVO;
}
-
-
+
+ @Override
+ public R payRefund(PayOrderRefundDto payOrderQueryDto) {
+ return null;
+ }
+
+ @Override
+ public ChargingOrderListInfoVO chargingInfo(String uid) {
+ TChargingOrder chargingOrder= this.getById(uid);
+
+ ChargingOrderListInfoVO chargingOrderListInfoVO = new ChargingOrderListInfoVO();
+ chargingOrderListInfoVO.setCode(chargingOrder.getCode());
+ List<Site> data = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData();
+ if (!data.isEmpty()){
+ chargingOrderListInfoVO.setSiteName(data.get(0).getName());
+ chargingOrderListInfoVO.setSiteAddress(data.get(0).getAddress());
+ }
+ TChargingGun data1 = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
+ TChargingPile data2 = chargingPileClient.getChargingPileById(data1.getChargingPileId()).getData();
+
+ if (data1!=null){
+ chargingOrderListInfoVO.setGunCode(data1.getCode());
+ chargingOrderListInfoVO.setTerminalName(data2.getName()+data1.getName());
+ }
+ chargingOrderListInfoVO.setEndMode(chargingOrder.getEndMode());
+ // todo 周一完善
+ // 获取开始SOC 结束soc
+ List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
+ if (!data6.isEmpty()){
+ // 第一条数据soc为开始 最后一条数据soc为结束soc
+ chargingOrderListInfoVO.setStartSoc(data6.get(0).getSoc().toString());
+ chargingOrderListInfoVO.setEndSoc(data6.get(data6.size()-1).getSoc().toString());
+ chargingOrderListInfoVO.setChargingCapacity(data6.get(data6.size()-1).getCharging_degree());
+ chargingOrderListInfoVO.setChargingSecond(data6.get(data6.size()-1).getCumulative_charging_time()*60+"");
+
+ }
+ if (chargingOrder.getAppUserCarId()!=null){
+ List<TAppUserCar> data3 = appUserCarClient.getCarByIds(Collections.singletonList(chargingOrder.getAppUserCarId())).getData();
+ if (!data3.isEmpty())chargingOrderListInfoVO.setLicensePlate(data3.get(0).getLicensePlate());
+ }
+ chargingOrderListInfoVO.setStartTime(chargingOrder.getStartTime());
+ chargingOrderListInfoVO.setEndTime(chargingOrder.getEndTime());
+ chargingOrderListInfoVO.setId(chargingOrder.getId());
+ chargingOrderListInfoVO.setUid(chargingOrder.getId().toString());
+ chargingOrderListInfoVO.setList(data6);
+ chargingOrderListInfoVO.setCouponDiscountAmount(chargingOrder.getCouponDiscountAmount());
+ chargingOrderListInfoVO.setVipDiscountAmount(chargingOrder.getVipDiscountAmount());
+ chargingOrderListInfoVO.setSharingAmount(chargingOrder.getSharingAmount());
+ chargingOrderListInfoVO.setCommissionAmount(chargingOrder.getCommissionAmount());
+ // 查询费用明细列表
+ List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery()
+ .eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId())
+ .list();
+ chargingOrderListInfoVO.setList1(list);
+ return chargingOrderListInfoVO;
+ }
+
/**
* 处理充电订单实时监控数据相关的业务逻辑
* @param query
--
Gitblit v1.7.1