Merge remote-tracking branch 'origin/master'

puzhibing

2024-10-29 befe4a62e799c89c73c0b774c000c300bcc2ca18

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

@@ -447,6 +447,7 @@
      chargingOrder.setVipDiscountAmount(BigDecimal.ZERO);
      chargingOrder.setOrderSource(0);
      chargingOrder.setTitle("【充电桩充电】" + chargingPile.getNumber() + "号桩/" + tChargingGun.getCode() + "号枪");
      chargingOrder.setStatus(1);
      
      Site site = siteClient.getSiteByIds(Arrays.asList(tChargingGun.getSiteId())).getData().get(0);
      Integer accountingStrategyId = tChargingGun.getAccountingStrategyId();
@@ -685,10 +686,10 @@
      String code = chargingOrder.getCode();
      String key = "AQJC_" + chargingOrder.getChargingGunId();
      List<PlatformStartChargingReply> data = platformStartChargingReplyClient.getPlatformStartChargingReply(code).getData();
      log.error(code + "：-------------------开始检查调起充电结果-------------------" + data.toString());
      if(null == data || data.size() == 0){
         return false;
      }
      log.error(code + "：-------------------开始检查调起充电结果-------------------" + data.toString());
      if(data.size() != 0){
         PlatformStartChargingReply platformStartChargingReply = data.get(1);
         Integer startup_result = platformStartChargingReply.getStartup_result();
@@ -981,6 +982,7 @@
      chargingOrder.setId(Long.valueOf(id));
      chargingOrder.setAppUserId(order.getAppUserId());
      chargingOrder.setEndTime(LocalDateTime.now());
      chargingOrder.setStatus(4);
      chargingOrder.setEndMode(1);
      this.updateById(chargingOrder);
      
@@ -2969,4 +2971,32 @@
   public Long countNoTag() {
      return this.baseMapper.countNoTag();
   }
	
	
   @Override
   public List<TChargingOrder> getChargingOrder(TChargingOrderVo order) {
      LambdaQueryWrapper<TChargingOrder> queryWrapper = new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getDelFlag, 0);
      if(null != order.getChargingPileId()){
         queryWrapper.eq(TChargingOrder::getChargingPileId, order.getChargingPileId());
      }
      if(null != order.getChargingGunId()){
         queryWrapper.eq(TChargingOrder::getChargingGunId, order.getChargingGunId());
      }
      if(null != order.getStatus()){
         queryWrapper.eq(TChargingOrder::getStatus, order.getStatus());
      }
      if(null != order.getAppUserId()){
         queryWrapper.eq(TChargingOrder::getAppUserId, order.getAppUserId());
      }
      if(null != order.getAppUserId()){
         queryWrapper.eq(TChargingOrder::getAppUserId, order.getAppUserId());
      }
      if(null != order.getStatusList()){
         queryWrapper.in(TChargingOrder::getAppUserId, order.getStatusList());
      }
      if(null != order.getEndMode()){
         queryWrapper.eq(TChargingOrder::getEndMode, order.getEndMode());
      }
      return this.list(queryWrapper.orderByDesc(TChargingOrder::getCreateTime));
   }
}