Просмотр исходного кода

Merge branch 'release_real_202012' of https://git.malls.iformall.com/server/formallProject into release_real_202012

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
734abd96a6
2 измененных файлов: 12 добавлений и 7 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/park/entity/ParkStopFee.java
  2. +11
    -6
      mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java

+ 1
- 1
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;


+ 11
- 6
mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkService.java Просмотреть файл

@@ -103,6 +103,10 @@ 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对接注意事项:
1、token有效期两个小时,每两小时内登录一次获取token,调业务接口不需要频繁登录用,建议获取一次token存本地缓存,之后从本地获取,两小时内刷新一次,
@@ -159,7 +163,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),
@@ -170,16 +174,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("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),
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");


Загрузка…
Отмена
Сохранить