Pu Zhibing
2025-07-22 3053622a190f1ed98a1fdd5ce998f9bda5cc7e87
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1826,9 +1826,7 @@
      dto.setSiteIds(siteIds);
      PageInfo<ChargingOrderListVO> pageInfo = new PageInfo<>(dto.getPageCurr(), dto.getPageSize());
      List<ChargingOrderListVO> list = this.baseMapper.chargingList(pageInfo, dto, startTime1, startTime2, endTime1, endTime2);
      List<Integer> siteIdsList = list.stream().map(ChargingOrderListVO::getSiteId).collect(Collectors.toList());
      if (siteIdsList.isEmpty()) siteIdsList.add(-1);
      List<Site> sites = siteClient.getSiteByIds(siteIdsList).getData();
      List<Site> sites = siteClient.getSiteAll().getData();
      
      for (ChargingOrderListVO chargingOrderListVO : list) {
         if (roleType == 2) {
@@ -2542,10 +2540,10 @@
            Integer soc = uploadRealTimeMonitoringData.getSoc();
            if (soc >= 98) {
               chargingOrder.setEndMode(2);
            } else if (chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0) {
            } else if (null != chargingOrder.getResidualAmount() && chargingOrder.getResidualAmount().compareTo(new BigDecimal(1)) <= 0) {
               chargingOrder.setEndMode(3);
            } else {
               chargingOrder.setEndMode(0);
               chargingOrder.setEndMode(1);
            }
         }
         chargingOrder.setResidualAmount(rechargeAmount.subtract(total).setScale(2, RoundingMode.HALF_EVEN));
@@ -4221,9 +4219,9 @@
   @Override
   public R pushOrderInfo(String code) {
      TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, code));
      tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
      tcecClient.notificationStopChargeResult(chargingOrder.getStartChargeSeq(), chargingOrder.getChargingGunId().toString(),
            chargingOrder.getOperatorId());
//      tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
//      tcecClient.notificationStopChargeResult(chargingOrder.getStartChargeSeq(), chargingOrder.getChargingGunId().toString(),
//            chargingOrder.getOperatorId());
      tcecClient.notificationChargeOrderInfo(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
      return R.ok();
   }
@@ -4327,9 +4325,10 @@
   }
   
   @Override
   public BigDecimal getSumDegreeBySiteIds(List<Integer> siteIds) {
      return this.baseMapper.getSumDegreeBySiteIds(siteIds);
   public Double getSumDegreeBySiteIds(List<Integer> siteIds) {
      Double sumDegreeBySiteIds = this.baseMapper.getSumDegreeBySiteIds(siteIds);
      return sumDegreeBySiteIds;
      
   }