From 94c9a001a185aec1b5ba6e4354e96cdde45e0ea0 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Thu, 9 Jan 2025 22:23:24 +0800 Subject: [PATCH] fix --- .../haikangweishiv3/HaiKangWeiShiV3ParkService.java | 10 +++++----- .../park/impl/haikangweishiv3/HaiKangWeiShiV3Util.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) 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 d48cb8ab1..df3f7548b 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 @@ -178,10 +178,10 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA if (null == valueMap) { return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置。"+coupon.getTitle()); } - String ruleSyscode = valueMap.get("ruleSyscode"); - if (StringUtils.isBlank(ruleSyscode)) { - return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[ruleSyscode]。"+coupon.getTitle()); - } + //String ruleSyscode = valueMap.get("ruleSyscode"); + //if (StringUtils.isBlank(ruleSyscode)) { + // return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[ruleSyscode]。"+coupon.getTitle()); + //} String couponCode = valueMap.get("couponCode"); if (StringUtils.isBlank(couponCode)) { return new ResultData(ErrorCode.COUPON_IS_EMPTY.getCode(),"当前停车券没有关联停车场优惠券配置[couponCode]。"+coupon.getTitle()); @@ -196,7 +196,7 @@ public class HaiKangWeiShiV3ParkService extends BaseParkService implements ParkA return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "已经使用过优惠券, 不能重复使用."); } - JSONObject retObj = haikangV3.useCoupon(park,getConfig(park),carNumber,ruleSyscode,couponCode); + JSONObject retObj = haikangV3.useCoupon(park,getConfig(park),carNumber,couponCode); RedisCacheUtils.cache(redisTemplate, "carStop:haikangv2StopInfoUseCoupon:"+carNumber+":"+inRecordSyscode, 1, 24*3600); return new ResultData(); 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 0678ecf1e..7445e9833 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 @@ -145,7 +145,7 @@ public class HaiKangWeiShiV3Util { /** * 使用优惠券 **/ - public JSONObject useCoupon(WxPark wxPark,ArtemisConfig config,String carNumber,String ruleSyscode,String couponCode){ + public JSONObject useCoupon(WxPark wxPark,ArtemisConfig config,String carNumber,String couponCode){ String vendroParams = wxPark.getVendorParams(); JSONObject vp = JSON.parseObject(vendroParams); @@ -153,7 +153,7 @@ public class HaiKangWeiShiV3Util { JSONArray array = new JSONArray(); JSONObject ob = new JSONObject(); - ob.put("ruleSyscode", ruleSyscode); + //ob.put("ruleSyscode", ruleSyscode); ob.put("merchantSyscode", merchantSysCode); ob.put("couponCode", couponCode); ob.put("plateNo", carNumber);