|
|
|
@@ -61,10 +61,8 @@ import com.iformall.utils.RedisLock; |
|
|
|
|
|
|
|
1>小程序首页 |
|
|
|
path:pages/index/index |
|
|
|
|
|
|
|
2>小程序订单页(车牌+车场编号 ) path: pages/thirdPayOrder/payOrder?carNo=车牌&parkCode=车场编号 |
|
|
|
|
|
|
|
3>小程序订单页(订单编号) path: pages/thirdPayOrderByNo/payOrder?orderNo=订单编号 |
|
|
|
|
|
|
|
2>小程序页面 pages/thirdPayOrderByNo/payOrder?orderNo=订单编号&freeMinute=免费离场时间(分钟数) |
|
|
|
|
|
|
|
*/ |
|
|
|
@Service |
|
|
|
@@ -193,6 +191,7 @@ public class JieShunV2ParkService extends BaseParkService implements ParkAdapter |
|
|
|
Double totalFee = attribute.getDouble("totalFee"); |
|
|
|
String appId = "wx24b70f0ad2a9a89a"; |
|
|
|
String parkOrderId = attribute.getString("orderNo"); |
|
|
|
Integer freeMinute = (Integer)park.getVendorParamsByKey("freeMinute"); |
|
|
|
if (totalFee <= 0 ) { |
|
|
|
String _createTime = attribute.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” |
|
|
|
String _endTime = attribute.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” |
|
|
|
@@ -210,7 +209,7 @@ public class JieShunV2ParkService extends BaseParkService implements ParkAdapter |
|
|
|
"0.00",appId,"payPath",null,msg,null); |
|
|
|
}else { |
|
|
|
return new ParkStopFee("-999",jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), |
|
|
|
"0.00",appId,"payPath",null,msg,"用券抵扣后账单为0,获得15分钟免费出场时间"); |
|
|
|
"0.00",appId,"payPath",null,msg,"用券抵扣后账单为0,获得"+freeMinute+"分钟免费出场时间"); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@@ -228,9 +227,10 @@ public class JieShunV2ParkService extends BaseParkService implements ParkAdapter |
|
|
|
JSONObject retObject = retArrays.getJSONObject(0).getJSONObject("attributes"); |
|
|
|
String createTime = retObject.getString("startTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” |
|
|
|
String endTime = retObject.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” |
|
|
|
String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); |
|
|
|
String payPath = "pages/thirdPayOrderByNo/payOrder?orderNo="+parkOrderId+"&freeMinute="+freeMinute; |
|
|
|
//String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); |
|
|
|
return new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), |
|
|
|
String.valueOf(retObject.getDouble("totalFee")),appId,payPath,null,null,"请支付后15分钟内离场"); |
|
|
|
String.valueOf(retObject.getDouble("totalFee")),appId,payPath,null,null,"请支付后"+freeMinute+"分钟内离场"); |
|
|
|
}else { |
|
|
|
logger.error("jieshunCarStopFee error. paramMap: {} . jieshunResult: {}",JSON.toJSONString(paramMap),ret); |
|
|
|
String msg = retObj.getString("message"); |
|
|
|
|