From 9dc82f0523649a2cbf62d26938140c79bca33981 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 18:41:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java
index 0f3445f..793ca4a 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java
+++ b/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,9 +70,8 @@
GetCouponResp resp = new GetCouponResp();
resp.setRecordId(data.getId());
resp.setCarNumber(carNumber);
- // todo 需要第三方提供数据
- resp.setSysOrgId("");
- resp.setPosName("");
+ resp.setSysOrgId("MXCD0001");
+ 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;
--
Gitblit v1.7.1