增加二维码单次金额上限及出水等待时间参数
diff --git a/src/main/java/com/supwisdom/dlpay/framework/util/WaterDeviceParam.java b/src/main/java/com/supwisdom/dlpay/framework/util/WaterDeviceParam.java
index 523d3a0..277ca33 100644
--- a/src/main/java/com/supwisdom/dlpay/framework/util/WaterDeviceParam.java
+++ b/src/main/java/com/supwisdom/dlpay/framework/util/WaterDeviceParam.java
@@ -13,6 +13,8 @@
public static final String pulseInHML = "pulseInHML";
// 刷卡单次出水上限
public static final String waterLimit = "waterlimit";
+ // 扫码单次出水上限
+ public static final String appWaterLimit = "app_water_limit";
// 单次扣费金额上限
public static final String AmountLimit = "amount_limit";
// 单位扣费金额
@@ -23,6 +25,8 @@
public static final String cobillNo = "cobillno";
// 从第多少百毫升开始计费
public static final String feestart = "feestart";
+ // 二维码出水等待时间
+ public static final String waitTime = "waittime";
// 二维码失效时间
public static final String validTime = "validtime";
// 二维码的url
diff --git a/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt b/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
index a80e156..3e88744 100644
--- a/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
+++ b/src/main/kotlin/com/supwisdom/dlpay/water/controller/api_controller.kt
@@ -112,6 +112,7 @@
.data(WaterDeviceParam.waterLimit, "")
.data(WaterDeviceParam.feestart, "")
.data(WaterDeviceParam.feeUnit, "")
+ .data(WaterDeviceParam.AmountLimit,"")
.data(WaterDeviceParam.permit, 1)
.data(WaterDeviceParam.limitMsg,"限制消费!未扣费金额过多")
.success())
@@ -205,6 +206,8 @@
.data(WaterDeviceParam.feeAmount, "")
.data(WaterDeviceParam.feestart, "")
.data(WaterDeviceParam.feeUnit, "")
+ .data(WaterDeviceParam.AmountLimit,"")
+ .data(WaterDeviceParam.waitTime,"")
// 如果订单为已支付状态，支付金额多少
.data(WaterDeviceParam.paidAmount, "")
.data(WaterDeviceParam.permit, 1)
@@ -217,14 +220,16 @@
.data(WaterDeviceParam.authStatus, authStatus)
//2为代扣模式
.data(WaterDeviceParam.payStatus, 2)
- .data(WaterDeviceParam.waterLimit, deviceParam[WaterDeviceParam.waterLimit]!!)
+ .data(WaterDeviceParam.waterLimit, deviceParam[WaterDeviceParam.appWaterLimit]!!)
.data(WaterDeviceParam.feeAmount, deviceParam[WaterDeviceParam.feeAmount]!!)
.data(WaterDeviceParam.feestart, deviceParam[WaterDeviceParam.feestart]!!)
.data(WaterDeviceParam.feeUnit, deviceParam[WaterDeviceParam.feeUnit]!!)
+ .data(WaterDeviceParam.AmountLimit,deviceParam[WaterDeviceParam.AmountLimit]!!)
+ .data(WaterDeviceParam.waitTime,deviceParam[WaterDeviceParam.waitTime]!!)
// 如果订单为已支付状态，支付金额多少
.data(WaterDeviceParam.paidAmount, 0)
-// .data(WaterDeviceParam.permit, 0)
-// .data(WaterDeviceParam.limitMsg,"")
+ .data(WaterDeviceParam.permit, 0)
+ .data(WaterDeviceParam.limitMsg,"")
.success())
} catch (ex: Exception) {
return ResponseEntity.ok(ResponseBodyBuilder.create()