From 1470fd40973c87e13fead9bce80a2308ff649b01 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 16:40:36 +0800 Subject: [PATCH 1/8] fix car --- .../iformall/service/park/impl/jieshun/JieShunParkService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0a59af98d..d0b98b9c2 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 @@ -163,7 +163,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe 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)); + "0.01",appId,"payPath",null,null)); } String parkOrderId = attribute.getString("orderNo"); From 1e4d56bf22b17cd206f783646faa4fd533d65e54 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 16:57:53 +0800 Subject: [PATCH 2/8] fix car --- .../iformall/service/park/impl/jieshun/JieShunParkService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d0b98b9c2..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 @@ -163,7 +163,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe 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.01",appId,"payPath",null,null)); + "0.00",appId,"payPath",null,msg)); } String parkOrderId = attribute.getString("orderNo"); From 769a05003c274b6cfc04c9f6dfc72194589166ab Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 17:06:58 +0800 Subject: [PATCH 3/8] fix car --- .../service/park/impl/jieshun/JieShunParkService.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 0a59af98d..c324ddaa9 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 @@ -170,16 +170,17 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe String ret = jieshun.getCarStopFee(park, parkOrderId, getCacheToken(park)); JSONObject retObj = JSON.parseObject(ret); if (retObj.getIntValue("resultCode") == 0){ - JSONObject object = retObj.getJSONObject("attributes"); - if (null == object ) { + JSONArray retArrays = retObj.getJSONArray("dataItems"); + if (null == retArrays || retArrays.size() == 0 ) { 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” + JSONObject retObject = retArrays.getJSONObject(0).getJSONObject("attributes"); + String createTime = retObject.getString("createTime");//计费时间,格式为“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(); return new ResultData(new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), - String.valueOf(object.getDouble("totalFee")),appId,payPath,null,null)); + String.valueOf(retObject.getDouble("totalFee")),appId,payPath,null,null)); }else { logger.error("jieshunCarStopFee error. paramMap: {} . jieshunResult: {}",JSON.toJSONString(paramMap),ret); String msg = retObj.getString("message"); From a633ff22378e4a51dcab2e95574bff5e755e4a7e Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 17:21:08 +0800 Subject: [PATCH 4/8] fix car --- .../java/com/iformall/service/park/entity/ParkStopFee.java | 2 +- .../service/park/impl/jieshun/JieShunParkService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 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 b2f1dfa17..a60925c1a 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 @@ -38,7 +38,7 @@ public class ParkStopFee implements Serializable{ this.entranceTime = getLocalDate(startTime); } if (null != endTime) { - this.exitTime = getLocalDate(endTime); + this.exitTime = getLocalDate(endTime); } if (!StringUtils.isBlank(fee)) { this.remainingFee = fee; 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 c324ddaa9..bd4a1a431 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 @@ -159,7 +159,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe Double totalFee = attribute.getDouble("totalFee"); String appId = "wx24b70f0ad2a9a89a"; if (totalFee <= 0 ) { - String _createTime = attribute.getString("createTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” + String _createTime = attribute.getString("startTime");//计费时间,格式为“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), @@ -176,7 +176,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe } JSONObject retObject = retArrays.getJSONObject(0).getJSONObject("attributes"); - String createTime = retObject.getString("createTime");//计费时间,格式为“yyyy-MM-dd HH:mi:ss” + 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(); return new ResultData(new ParkStopFee(parkOrderId,jieshun.utcToLocal(createTime),jieshun.utcToLocal(endTime), From f20a1d9a4b8a27d284642869c90f3b507db08669 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 17:38:23 +0800 Subject: [PATCH 5/8] fix car --- .../main/java/com/iformall/service/park/entity/ParkStopFee.java | 2 ++ .../iformall/service/park/impl/jieshun/JieShunParkService.java | 2 ++ 2 files changed, 4 insertions(+) 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 a60925c1a..55ca2fbf9 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 @@ -55,6 +55,8 @@ public class ParkStopFee implements Serializable{ if (!StringUtils.isBlank(remark)) { this.remark = remark; } + extraData.put("123123", "adfadsfasd"); + extraData.put("adasdas", 123123); } 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 bd4a1a431..957315c70 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 @@ -104,6 +104,8 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe * 先去捷顺注册,调用登陆获取令牌,然后根据令牌调用别的接口 * http://ap.jieshun.cn:9088/apply/ 注册信息地址 fumao/iformall2020 * + * 门店商户号 000000008032172000003 密码 ycHqp61Acudxz + * * API对接注意事项: 1、token有效期两个小时,每两小时内登录一次获取token,调业务接口不需要频繁登录用,建议获取一次token存本地缓存,之后从本地获取,两小时内刷新一次, 为避免调业务接口时刚好token被刷新,导致token失效(无效的令牌或令牌已过期),可以做下容错,重新登录获取token或用最新token重新调业务接口。 From 60e71424cd3c575171234a3edfff490163dd842b Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 17:50:12 +0800 Subject: [PATCH 6/8] fix car --- .../java/com/iformall/service/park/entity/ParkStopFee.java | 4 ++-- .../service/park/impl/jieshun/JieShunParkService.java | 2 ++ 2 files changed, 4 insertions(+), 2 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 55ca2fbf9..22eb17066 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 @@ -55,8 +55,8 @@ public class ParkStopFee implements Serializable{ if (!StringUtils.isBlank(remark)) { this.remark = remark; } - extraData.put("123123", "adfadsfasd"); - extraData.put("adasdas", 123123); + extraData.put("12312", "123123"); + extraData.put("121212", 123123123); } 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 957315c70..7967af3be 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 @@ -104,6 +104,8 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe * 先去捷顺注册,调用登陆获取令牌,然后根据令牌调用别的接口 * http://ap.jieshun.cn:9088/apply/ 注册信息地址 fumao/iformall2020 * + * 捷顺商户平台:http://merchant.jslife.com.cn/merchant/index.html#/auth/login + * 捷顺门店平台:http://merchant.jslife.com.cn/store/index.html#/auth/login * 门店商户号 000000008032172000003 密码 ycHqp61Acudxz * * API对接注意事项: From 119b3548a33b6d5c9d4787ab818614072006dbca Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 17:56:44 +0800 Subject: [PATCH 7/8] fix car --- .../java/com/iformall/service/park/entity/ParkStopFee.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 22eb17066..80fd2d0a3 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 @@ -55,8 +55,8 @@ public class ParkStopFee implements Serializable{ if (!StringUtils.isBlank(remark)) { this.remark = remark; } - extraData.put("12312", "123123"); - extraData.put("121212", 123123123); + this.extraData.put("12312", "123123"); + this.extraData.put("121212", 123123123); } From 2861f82a988d1d8f198ff5ce5608e813ff465c84 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 18:08:55 +0800 Subject: [PATCH 8/8] fix car --- .../main/java/com/iformall/service/park/entity/ParkStopFee.java | 2 -- 1 file changed, 2 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 80fd2d0a3..a60925c1a 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 @@ -55,8 +55,6 @@ public class ParkStopFee implements Serializable{ if (!StringUtils.isBlank(remark)) { this.remark = remark; } - this.extraData.put("12312", "123123"); - this.extraData.put("121212", 123123123); }