From 77930f84c8962eb365bb1bd9303d844555f93221 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 69 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 30 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 371ad73..2123005 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
@@ -27,6 +27,7 @@
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;
@@ -51,12 +52,16 @@
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.factory.annotation.Autowired;
@@ -881,8 +886,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;
@@ -895,13 +905,7 @@
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);
@@ -1085,31 +1089,36 @@
}
chargingOrderListInfoVO.setEndMode(chargingOrder.getEndMode());
// todo 周一完善
-// chargingOrderListInfoVO.setStartSoc();
-// chargingOrderListInfoVO.setEndSoc();
-// chargingOrderListInfoVO.setChargingCapacity();
-// chargingOrderListInfoVO.setSiteId();
-// chargingOrderListInfoVO.setChargingPileId();
-// chargingOrderListInfoVO.setAppUserId();
-// chargingOrderListInfoVO.setAppUserCarId();
-// chargingOrderListInfoVO.setChargingGunId();
-// chargingOrderListInfoVO.setOrderType();
-// chargingOrderListInfoVO.setChargingSecond();
-// chargingOrderListInfoVO.setLicensePlate();
-// chargingOrderListInfoVO.setPhone();
-// chargingOrderListInfoVO.setPaymentAmount();
-// chargingOrderListInfoVO.setElectrovalence();
-// chargingOrderListInfoVO.setServiceCharge();
-// chargingOrderListInfoVO.setStartTime();
-// chargingOrderListInfoVO.setEndTime();
-// chargingOrderListInfoVO.setId();
-// chargingOrderListInfoVO.setUid();
-// chargingOrderListInfoVO.setList();
+ // 获取开始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+"");
-
- return null;
+ }
+ 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;
}
-
/**
* 处理充电订单实时监控数据相关的业务逻辑
--
Gitblit v1.7.1