From bd747b0ce19bb0944ad304fbae17e559692d4ad5 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 16:04:55 +0800 Subject: [PATCH] fix car --- .../service/park/entity/ParkStopFee.java | 15 +++++++++-- .../service/park/impl/cyf/CYFParkService.java | 2 +- .../park/impl/jieshun/JieShunParkService.java | 25 ++++++++++++++----- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java index c937141c9..b2f1dfa17 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java +++ b/mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java @@ -25,10 +25,12 @@ public class ParkStopFee implements Serializable{ /*支付小程序页面路径**/ private String payPath=""; /*给支付小程序的额外数据**/ - private Map extraData=new HashMap();; + private Map extraData=new HashMap(); + /*备注**/ + private String remark=""; - public ParkStopFee(String orderId,Date startTime,Date endTime,String fee,String appId,String payPath,Map extraData) { + public ParkStopFee(String orderId,Date startTime,Date endTime,String fee,String appId,String payPath,Map extraData,String remark) { if (!StringUtils.isBlank(orderId)) { this.orderId = orderId; } @@ -50,6 +52,9 @@ public class ParkStopFee implements Serializable{ if (null != extraData) { this.extraData = extraData; } + if (!StringUtils.isBlank(remark)) { + this.remark = remark; + } } @@ -100,4 +105,10 @@ public class ParkStopFee implements Serializable{ public void setExtraData(Map extraData) { this.extraData = extraData; } + public String getRemark() { + return remark; + } + public void setRemark(String remark) { + this.remark = remark; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java index 975ae311d..20e8f583d 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java @@ -125,7 +125,7 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic String appId = ""; String payPath = ""; return new ResultData(new ParkStopFee(retObj.getString("orderId"), cyf.utcToLocal(String.valueOf(createTime)), - cyf.utcToLocal(String.valueOf(endTime)), String.valueOf(retObj.getDouble("fee")),appId,payPath,null)); + cyf.utcToLocal(String.valueOf(endTime)), String.valueOf(retObj.getDouble("fee")),appId,payPath,null,null)); }else { logger.error("cyfCarStopFee error. paramMap: {} . cyfResult: {}",JSON.toJSONString(paramMap),ret); String msg = retObj.getString("strError"); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java index 6600b8f92..0a59af98d 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java @@ -155,18 +155,31 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe if (null == arrays || arrays.size() == 0) { throw new MallinkException(result.getInteger("resultCode"), "jieshun createOrder error. no order result"+carNumber); } + JSONObject attribute = arrays.getJSONObject(0).getJSONObject("attributes"); + Double totalFee = attribute.getDouble("totalFee"); + String appId = "wx24b70f0ad2a9a89a"; + if (totalFee <= 0 ) { + String _createTime = attribute.getString("createTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” + String _endTime = attribute.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” + String msg = attribute.getString("retmsg"); + return new ResultData(new ParkStopFee("-999",jieshun.utcToLocal(_createTime),jieshun.utcToLocal(_endTime), + "0.00",appId,"payPath",null,msg)); + } - String parkOrderId = arrays.getJSONObject(0).getJSONObject("attributes").getString("orderNo"); - + String parkOrderId = attribute.getString("orderNo"); String ret = jieshun.getCarStopFee(park, parkOrderId, getCacheToken(park)); JSONObject retObj = JSON.parseObject(ret); if (retObj.getIntValue("resultCode") == 0){ - String createTime = retObj.getString("createTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” - String endTime = retObj.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” - String appId = "wx24b70f0ad2a9a89a"; + JSONObject object = retObj.getJSONObject("attributes"); + if (null == object ) { + throw new MallinkException(result.getInteger("resultCode"), "jieshun getCarStopFee error. no order result"+carNumber); + } + + String createTime = object.getString("createTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” + String endTime = object.getString("endTime");//离场时间,格式为“yyyy-MM-dd HH:mi:ss” String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkingId(); return new ResultData(new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), - String.valueOf(retObj.getDouble("totalFee")),appId,payPath,null)); + String.valueOf(object.getDouble("totalFee")),appId,payPath,null,null)); }else { logger.error("jieshunCarStopFee error. paramMap: {} . jieshunResult: {}",JSON.toJSONString(paramMap),ret); String msg = retObj.getString("message");