From 895432bdcfe54f0109af92e6740ced73af4e3d1f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 14 Dec 2020 14:06:26 +0800 Subject: [PATCH] fix car --- .../service/park/impl/jieshun/JieShunParkService.java | 2 +- .../com/iformall/service/park/impl/jieshun/JieShunUtil.java | 4 ++-- 2 files changed, 3 insertions(+), 3 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 98845ca79..70c450764 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 @@ -158,7 +158,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe 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"; - String payPath = "pages/thirdPayOrder/payOrder?carNo="+jieshun.handleCarNumber(carNumber)+"&parkCode="+park.getParkId(); + 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)); }else { diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java index 56ac8ade2..b314431b6 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunUtil.java @@ -140,7 +140,7 @@ public class JieShunUtil { JSONObject vp = JSON.parseObject(vendroParams); Map param = new HashMap(); param.put("businesserCode", vp.get("businesserCode"));//商户编号 - param.put("parkCode", wxPark.getParkId()); + param.put("parkCode", wxPark.getParkingId()); param.put("orderType", "VNP"); param.put("carNo", handleCarNumber(cardNumber)); Map map = generateMap("3c.pay.createorderbycarno",param); @@ -191,7 +191,7 @@ public class JieShunUtil { param.put("businesserCode", vp.get("businesserCode"));//商户编号 param.put("couponsNo", couponNo);//优惠券编号 param.put("orderNo", orderNo);//商户编号 - param.put("parkCode", wxPark.getParkId()); + param.put("parkCode", wxPark.getParkingId()); Map map = generateMap("3c.coupons.use.coupons",param); log.info("jieshun useCoupon :" + JSON.toJSONString(map)); return ProcBussiness(COUPON_USE, wxPark.getParkingId(), map, token,vp.getString("version"),vp.getString("signkey"));