代码提交

无关风月

2024-08-31 1d4407945510f717f1d3e8892387e473277de5c7

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java

@@ -42,6 +42,7 @@
import com.ruoyi.order.service.TChargingOrderAccountingStrategyService;
import com.ruoyi.order.service.TChargingOrderService;
import com.ruoyi.order.service.TOrderEvaluateService;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
import com.ruoyi.payment.api.vo.*;
@@ -588,8 +589,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()));
@@ -655,6 +656,7 @@
      return R.ok(pageInfo);
   }


   @Override
   public ChargingOrderTimeVO chargingList(ChargingListQuery dto) {
      String startTime1 = null;
@@ -678,6 +680,7 @@
      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();
@@ -689,7 +692,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) {
@@ -816,4 +833,49 @@
      chargingOrderTimeVO.setList(pageInfo);
      return chargingOrderTimeVO;
   }

   @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 周一完善
//      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();


      return null;
   }
}