修改三方平台对接bug

Pu Zhibing

2025-02-14 42bf8a2dd15aec70cb5c38896472b7f759c67dcb

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

@@ -206,6 +206,9 @@
   
   @Resource
   private OperatorClient operatorClient;
	
   @Resource
   private TransactionRecordClient transactionRecordClient;



@@ -611,6 +614,7 @@
         if(null != data && data.getChargeNum() > 0){
            //计算折扣
            List<AccountingStrategyDetailOrder> list = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
            list.get(list.size() - 1).setEndTime("23:59");
            //将数据叠加两份，处理跨天的情况
            list.addAll(list);
            boolean sta = false;
@@ -854,7 +858,7 @@
         chargingGun.setStatus(4);
         chargingGunClient.updateChargingGunById(chargingGun);
         //推送状态给三方平台
         tcecClient.pushChargingGunStatus(chargingGun.getId(), chargingGun.getStatus());
         tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), chargingGun.getStatus());
      }
      redisService.setCacheObject("AQJC_" + order.getChargingGunId(), preChargeCheck1, 24L, TimeUnit.HOURS);
      this.updateById(order);
@@ -1251,7 +1255,7 @@
         endTime2 = split[1];
      }
      PageInfo<ChargingOrderVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
      PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,9999999);
      PageInfo<ChargingOrderVO> pageInfo1 = new PageInfo<>(1,999999999);

      if (StringUtils.hasLength(dto.getPhone())){
         List<Long> data = appUserClient.getUserIdsByPhone(dto.getPhone()).getData();
@@ -2002,6 +2006,9 @@
   @GlobalTransactional(rollbackFor = Exception.class)
   public R endChargeBillingCharge(TransactionRecordMessageVO vo) {
      TChargingOrder chargingOrder = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getCode, vo.getTransaction_serial_number()));
      if(null == chargingOrder){
         return R.ok();
      }
      Integer status = chargingOrder.getStatus();
      if(status == 5){
         return R.ok();
@@ -2353,7 +2360,7 @@
      chargingGunClient.updateChargingGunById(chargingGun);
      //推送状态给三方平台
      if(2 == chargingOrder.getOrderSource()){
         tcecClient.pushChargingGunStatus(chargingGun.getId(), chargingGun.getStatus());
         tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), chargingGun.getStatus());
      }
      
      //添加积分
@@ -3753,4 +3760,24 @@
      });
      return R.ok();
   }
	
	
   /**
    * 获取充电后没有扣除费用的数据
    * @return
    */
   @Override
   public R getNotPaymentChargingOrder() {
      List<TChargingOrder> list = this.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getPaymentAmount, 0)
            .ne(TChargingOrder::getElectricity, 0).in(TChargingOrder::getStatus, Arrays.asList(4, 5)));
      List<Map<String, Object>> mapList = new ArrayList<>();
      for (TChargingOrder order : list) {
         TransactionRecord transactionRecord = transactionRecordClient.findTransactionRecord(order.getCode()).getData();
         Map<String, Object> map = new HashMap<>();
         map.put("order", order);
         map.put("transactionRecord", transactionRecord);
         mapList.add(map);
      }
      return R.ok(mapList);
   }
}