Merge remote-tracking branch 'origin/master'

xuhy

2025-01-07 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java

@@ -47,7 +47,7 @@
   public GetCouponResp getCoupon(GetCouponReq req){
      //根据车牌查询入场时间，后再根据入场时间和车牌查询是否有充电订单
      String carNumber = req.getCarNumber();
      String appKey = req.getAppKey();
      String appKey = req.getAppkey();
      TParkingLot parkingLot = parkingLotClient.getParkingLotByAppKey(appKey).getData();
      if(null == parkingLot){
         return null;
@@ -70,7 +70,7 @@
      GetCouponResp resp = new GetCouponResp();
      resp.setRecordId(data.getId());
      resp.setCarNumber(carNumber);
      resp.setSysOrgId("MXCD7QjHapTJGZ8TZZz3");
      resp.setSysOrgId("MXCD0001");
      resp.setPosName("明星电力");
      resp.setLssuer("admin");
      resp.setType(4);
@@ -85,10 +85,6 @@
      }else{
         resp.setCouponName("充电停车时长优惠");
         parameter.setTime(parkingLot.getChargeFreeDuration());
         data.setFreeDuration(parkingLot.getNonChargeFreeDuration());
         data.setChargingOrderId(tChargingOrder.getId());
         data.setAppUserId(tChargingOrder.getAppUserId());
         parkingRecordClient.updateParkingRecord(data);
      }
      resp.setParameter(parameter);
      return resp;