From 61585c2cfaefbf8c5c26be6be7756317c0bda0ff Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 14:49:33 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/CouponService.java | 6 +-----
1 files changed, 1 insertions(+), 5 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 f028d1a..cd28af9 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;
@@ -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;
--
Gitblit v1.7.1