合并代码

Pu Zhibing

2024-11-05 63f7a9310dd1649b7ae2bc680a37ac73536be64c

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

@@ -70,9 +70,8 @@
      GetCouponResp resp = new GetCouponResp();
      resp.setRecordId(data.getId());
      resp.setCarNumber(carNumber);
      // todo 需要第三方提供数据
      resp.setSysOrgId("mxcd001");
      resp.setPosName("明星新能源");
      resp.setSysOrgId("MXCD7QjHapTJGZ8TZZz3");
      resp.setPosName("明星电力");
      resp.setLssuer("admin");
      resp.setType(4);
      Parameter parameter = new Parameter();
@@ -86,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;