diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 078b149ef..26d2b6c11 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -337,7 +337,7 @@ public class WxCarController extends BaseController { if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { - if (null != used && used.intValue() < 1) { + if (null == used || (null != used && used.intValue() < 1)) { ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber); if (result.code == Result.SUCCESS) { ParkCacheUtils.setCarCouponUsedCacheLock(redisTemplate, vendor.getMessage(), carNumber); @@ -351,7 +351,7 @@ public class WxCarController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券为空"); } try { - if (null != used && used.intValue() < 1) { + if (null == used || (null != used && used.intValue() < 1)) { ResultData rs = parkFactory.getParkService(park.getVendorType()).useCoupon(paramMap, park, userCar, coupon, carNumber); if (rs.code == Result.SUCCESS) { etcpHelper.updateWxCouponOrderUsed(userCar, park); diff --git a/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java b/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java index f766197c8..4302f6b0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java +++ b/mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java @@ -13,12 +13,12 @@ public class ParkCacheUtils { public static void setCarCouponUnUseCacheLock(RedisTemplate template,String parkVendor,String carNumber) { String key = "carStop:"+parkVendor+":"+carNumber; - RedisCacheUtils.cache(template, key, 0, 24*3600); + RedisCacheUtils.cache(template, key, 0, 12*3600); } public static void setCarCouponUsedCacheLock(RedisTemplate template,String parkVendor,String carNumber) { String key = "carStop:"+parkVendor+":"+carNumber; - RedisCacheUtils.cache(template, key, 1, 24*3600); + RedisCacheUtils.cache(template, key, 1, 12*3600); } public static Integer getCarCouponUseCacheLock(RedisTemplate template,String parkVendor,String carNumber) {