diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java index 2acb41f38..925e3eee2 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3ParkService.java @@ -133,7 +133,7 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA throw new MallinkException(21000,"车辆未入场"); } - JSONObject attribute = haikangV3.getCarStopFee(park, carNumber, getConfig(park)); + JSONObject attribute = haikangV3.getCarStopFee(park, carNumber, getConfig(park),null); String appId = ""; String parkOrderId = attribute.getString("billSyscode"); @@ -196,7 +196,7 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA } //查询临停信息,判断缓存是否已经存在 - JSONObject stopInfo = haikangV3.getCarStopFee(park, carNumber, getConfig(park)); + JSONObject stopInfo = haikangV3.getCarStopFee(park, carNumber, getConfig(park),null); String inRecordSyscode = stopInfo.getString("inRecordSyscode"); Integer used = RedisCacheUtils.getCacheInteger(redisTemplate, "carStop:haikangv3StopInfoUseCoupon:"+carNumber+":"+inRecordSyscode); if (null == used || (null != used && used.intValue() < 1) ) { @@ -209,7 +209,7 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA String couponEnd = dateToISO8601Time(coupon.getValidEndDate()); ArtemisConfig config = getConfig(park); JSONObject retObj = haikangV3.useCoupon(park,config,carNumber,couponCode,couponStart,couponEnd,coupon); - haikangV3.getCarStopFee(park, carNumber, config); + haikangV3.getCarStopFee(park, carNumber, config,couponCode); RedisCacheUtils.cache(redisTemplate, "carStop:haikangv3StopInfoUseCoupon:"+carNumber+":"+inRecordSyscode, 1, 24*3600); return new ResultData(); @@ -217,7 +217,7 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA @Override public ParkCreatePayOrder createPayOrder(Map paramMap, WxPark park, String carNumber) throws Exception { - JSONObject result = haikangV3.getCarStopFee(park, carNumber, getConfig(park)); + JSONObject result = haikangV3.getCarStopFee(park, carNumber, getConfig(park),null); String parkOrderId = result.getString("billSyscode"); Double needfee = 0.00; String neddfeestr = result.getString("supposeCost"); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java index 3abc43f9b..f7af87f50 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java @@ -123,12 +123,15 @@ public class HaiKangWeiShiV3Util { /** * 查询停车费 **/ - public JSONObject getCarStopFee(WxPark wxPark,String carNumber,ArtemisConfig config){ + public JSONObject getCarStopFee(WxPark wxPark,String carNumber,ArtemisConfig config,String hkCouponCode){ String vendroParams = wxPark.getVendorParams(); JSONObject vp = JSON.parseObject(vendroParams); JSONObject ob = new JSONObject(); ob.put("plateNo", carNumber); ob.put("parkSyscode", wxPark.getParkingId()); + if (StringUtils.isNotBlank(hkCouponCode)) { + ob.put("couponCode", hkCouponCode); + } try { String retCode = callPostApi(config,QUERY_PRICE, JSON.toJSONString(ob)); if (StringUtils.isBlank(retCode)) {