完善支付相关功能

zhibing.pu

2024-08-28 1c700866489090952fb692c5c16be622131a8c3e

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

@@ -22,7 +22,11 @@
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.integration.api.feignClient.ChargingHandshakeClient;
import com.ruoyi.integration.api.feignClient.SendMessageClient;
import com.ruoyi.integration.api.feignClient.UploadRealTimeMonitoringDataClient;
import com.ruoyi.integration.api.model.ChargingHandshake;
import com.ruoyi.integration.api.model.PlatformStartCharging;
import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
@@ -100,6 +104,11 @@
   @Resource
   private UploadRealTimeMonitoringDataClient uploadRealTimeMonitoringDataClient;
   
   @Resource
   private ChargingHandshakeClient chargingHandshakeClient;
	
   @Resource
   private SendMessageClient sendMessageClient;
   
   
   
@@ -133,7 +142,9 @@
         myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         orderLists.add(myChargingOrderList);
      }
      list = this.baseMapper.getMyChargingOrderList(appUserId, query.getType(), null, null);
      map.put("list", orderLists);
      map.put("totle", list.size());
      return map;
   }
   
@@ -203,7 +214,7 @@
            map.put("time", time.get(i));
            //soc
            map.put("soc", soc.get(i));
            //电压
            //功率
            map.put("power", po.get(i));
            power.add(map);
         }
@@ -410,10 +421,25 @@
      preChargeCheck.setSecureConnectionDetection(false);
      String key = "AQJC_" + chargingOrder.getChargingGunId();
      redisService.setCacheObject(key, preChargeCheck);
      //开始检测充电桩状，将检查状态写入缓存。检测完成后开始开启充电
      //充电结束后需要计算退款剩余金额
      // todo 需要完善
      
      //根据当前充值的金额和计费模板算出充电的金额
      BigDecimal rechargeAmount = chargingOrder.getRechargeAmount();
      //计算充电金额，会员需要将折扣金额加入到充电总金额中
		
//      TAppUser appUser = appUserClient.getUserById(chargingOrder.getAppUserId()).getData();
//      if(){
//         appUser.getVipId()
//      }
//
//
//      //调用远程启动充电消息
//      PlatformStartCharging platformStartCharging = new PlatformStartCharging();
//      platformStartCharging.setTransaction_serial_number(chargingOrder.getCode());
//      platformStartCharging.setCharging_pile_code();
//      platformStartCharging.setCharging_gun_code();
//      platformStartCharging.setCard_number();
//      platformStartCharging.setAccount_balance()
//      sendMessageClient.platformStartCharging(platformStartCharging);
      return AjaxResult.success();
   }
   
@@ -431,7 +457,6 @@
      if(null == one){
         return null;
      }
      // todo 需要完善充电实时数据
      ChargingDetails chargingDetails = new ChargingDetails();
      chargingDetails.setId(one.getId().toString());
      TChargingGun chargingGun = chargingGunClient.getChargingGunById(id).getData();
@@ -440,6 +465,27 @@
      chargingDetails.setName(site.getName() + "-" + chargingPile.getName());
      chargingDetails.setCode(one.getCode());
      chargingDetails.setStatus(one.getStatus());
      UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataClient.chargingOrderInfo(one.getCode()).getData();
      if(null != data){
         chargingDetails.setChargeCurrent(data.getOutput_current());
         chargingDetails.setChargeVoltage(data.getOutput_voltage());
         BigDecimal power = data.getOutput_current().multiply(data.getOutput_voltage()).divide(new BigDecimal(1000));
         chargingDetails.setChargePower(power);
         chargingDetails.setCompletionRatio(data.getSoc());
         chargingDetails.setRemainingChargeTime(data.getTime_remaining());
         chargingDetails.setChargedDegrees(data.getCharging_degree());
         chargingDetails.setChargedTime(data.getCumulative_charging_time());
         chargingDetails.setChargingCost(data.getPaid_amount());
      }
      ChargingHandshake chargingHandshake = chargingHandshakeClient.getDataByOrderCode(one.getCode()).getData();
      if(null != chargingHandshake && null != data && null != one.getAppUserCarId()){
         BigDecimal bms_battery_capacity = chargingHandshake.getBms_battery_capacity();
         TAppUserCar appUserCar = appUserCarClient.getCarByIds(Arrays.asList(one.getAppUserCarId())).getData().get(0);
         //   续航 = 电池容量 / 续航里程 * soc
         BigDecimal divide = bms_battery_capacity.divide(new BigDecimal(appUserCar.getEndurance()));
         BigDecimal multiply = new BigDecimal(data.getSoc() / 100).multiply(divide);
         chargingDetails.setEndurance(multiply);
      }
      return chargingDetails;
   }
   
@@ -460,10 +506,21 @@
      chargingOrder.setEndMode(1);
      this.updateById(chargingOrder);
      //调用硬件停止充电，停止成功后开始计算费用退款
		
		
		
      // todo 待完善
      return AjaxResult.success();
   }

	
	
   public void endCharge(){
	
   }
	
	
	

    @Override
    public TCharingOrderVO chargingOrder(ChargingOrderQuery dto) {