|
|
@ -118,11 +118,11 @@ public class YltControllerForWx {
|
|
|
|
//本地车场配置减免规则,根据充电时长换算
|
|
|
|
//本地车场配置减免规则,根据充电时长换算
|
|
|
|
int freeType = 1;
|
|
|
|
int freeType = 1;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JSONObject jo = new JSONObject();
|
|
|
|
//必须保证满足最低收费规则
|
|
|
|
//必须保证满足最低收费规则
|
|
|
|
if (totalMoney >= mini_receivable_total_fee && power >= mini_charge_ah) {
|
|
|
|
if (totalMoney >= mini_receivable_total_fee && power >= mini_charge_ah) {
|
|
|
|
// 科拓闸机
|
|
|
|
// 科拓闸机
|
|
|
|
if ("科拓".equals(name)) {
|
|
|
|
if ("科拓".equals(name)) {
|
|
|
|
JSONObject jo = new JSONObject();
|
|
|
|
|
|
|
|
jo.put("appId", appId);
|
|
|
|
jo.put("appId", appId);
|
|
|
|
jo.put("parkId", parkId);
|
|
|
|
jo.put("parkId", parkId);
|
|
|
|
jo.put("serviceCode", "syncChargePilePay");
|
|
|
|
jo.put("serviceCode", "syncChargePilePay");
|
|
|
@ -157,7 +157,6 @@ public class YltControllerForWx {
|
|
|
|
ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
|
|
|
|
ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
|
|
|
|
return ResultVO.success(JSONObject.parseObject(result));
|
|
|
|
return ResultVO.success(JSONObject.parseObject(result));
|
|
|
|
} else if ("智门科技".equals(name)) {
|
|
|
|
} else if ("智门科技".equals(name)) {
|
|
|
|
JSONObject jo = new JSONObject();
|
|
|
|
|
|
|
|
jo.put("Ver", 2);//协议版本
|
|
|
|
jo.put("Ver", 2);//协议版本
|
|
|
|
jo.put("Uid", UUID.randomUUID().toString().toUpperCase());//请求编号(协议唯一码,可使用uuid)
|
|
|
|
jo.put("Uid", UUID.randomUUID().toString().toUpperCase());//请求编号(协议唯一码,可使用uuid)
|
|
|
|
jo.put("Timestamp", System.currentTimeMillis());//时间戳(1970-01-01到现在的秒数)
|
|
|
|
jo.put("Timestamp", System.currentTimeMillis());//时间戳(1970-01-01到现在的秒数)
|
|
|
@ -180,7 +179,6 @@ public class YltControllerForWx {
|
|
|
|
ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
|
|
|
|
ym.recordDzLog(order_no, charge_plate_no, jo.toString(), result);
|
|
|
|
return ResultVO.success(JSONObject.parseObject(result));
|
|
|
|
return ResultVO.success(JSONObject.parseObject(result));
|
|
|
|
} else if ("安快I".equals(name)) {
|
|
|
|
} else if ("安快I".equals(name)) {
|
|
|
|
JSONObject jo = new JSONObject();
|
|
|
|
|
|
|
|
jo.put("parkNo", parkId);
|
|
|
|
jo.put("parkNo", parkId);
|
|
|
|
jo.put("plate", charge_plate_no);//车牌号
|
|
|
|
jo.put("plate", charge_plate_no);//车牌号
|
|
|
|
jo.put("plate_color", 5);//车牌颜色,绿色
|
|
|
|
jo.put("plate_color", 5);//车牌颜色,绿色
|
|
|
|