From 9d711d2e762f0fa4831b4a2190a07026d4a57f15 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 16 Dec 2020 10:14:54 +0800 Subject: [PATCH] fix car --- .../main/java/com/iformall/controller/WxCarController.java | 2 +- .../service/park/impl/jieshun/JieShunParkService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 26d2b6c11..fea2d5c43 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -277,7 +277,7 @@ public class WxCarController extends BaseController { "TJD:{\"carNumber\":\"string\",\"tradeId\":\"string\",\"accountId\":\"string\",\"couponOrderId\":\"string\"}\n" + "ShangAn:{\"carNumber\":\"string\",\"couponOrderId\":\"string\"}\n" + "BoLink:{\"carNumber\":\"string\",\"orderId\":\"string\",\"couponOrderId\":\"string\"}\n" + - "jieshun:{\"carNumber\":\"string\",\"orderId\":\"string\",\"couponOrderId\":\"string\",\"jsOrderId\":\"string\"}\n}" + "jieshun或者其他:{\"carNumber\":\"string\",\"orderId\":\"string\",\"couponOrderId\":\"string\",\"parkOrderId\":\"string\"}\n}" ) @PostMapping("/getCoupon") public ResultData getCoupon(@RequestBody Map paramMap) { 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 27e216c2a..86157e4d5 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 @@ -211,7 +211,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe if (null == valueMap) { return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置。"+coupon.getTitle()); } - String orderNo = paramMap.get("jsOrderId"); + String orderNo = paramMap.get("parkOrderId"); String planNo = valueMap.get("planNo"); @@ -221,7 +221,7 @@ public class JieShunParkService extends BaseParkService implements ParkAdapterSe if (retObj.getIntValue("resultCode") == 0){ JSONArray couponArrays = retObj.getJSONArray("dataItems"); if (null != couponArrays && couponArrays.size() > 0 ) { - JSONObject coupoo = couponArrays.getJSONObject(0); + JSONObject coupoo = couponArrays.getJSONObject(0).getJSONObject("attributes"); String couponNo = coupoo.getString("couponsNo"); String rret = jieshun.useCoupon(park, couponNo, orderNo, getCacheToken(park)); logger.info("jieshun useCoupon[couponOrderId:"+userCar.getId()+";jieshunOrderNo:"+orderNo+"] result:"+rret);