浏览代码

fix car bug

release_toaliyun_real
xiaohanzi 5 年前
父节点
当前提交
3b72f28d1f
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java

+ 2
- 2
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 (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); ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber);
if (result.code == Result.SUCCESS) { if (result.code == Result.SUCCESS) {
ParkCacheUtils.setCarCouponUsedCacheLock(redisTemplate, vendor.getMessage(), carNumber); ParkCacheUtils.setCarCouponUsedCacheLock(redisTemplate, vendor.getMessage(), carNumber);
@@ -351,7 +351,7 @@ public class WxCarController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券为空");
} }
try { 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); ResultData rs = parkFactory.getParkService(park.getVendorType()).useCoupon(paramMap, park, userCar, coupon, carNumber);
if (rs.code == Result.SUCCESS) { if (rs.code == Result.SUCCESS) {
etcpHelper.updateWxCouponOrderUsed(userCar, park); etcpHelper.updateWxCouponOrderUsed(userCar, park);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/park/utils/ParkCacheUtils.java 查看文件

@@ -13,12 +13,12 @@ public class ParkCacheUtils {
public static void setCarCouponUnUseCacheLock(RedisTemplate<String, Object> template,String parkVendor,String carNumber) { public static void setCarCouponUnUseCacheLock(RedisTemplate<String, Object> template,String parkVendor,String carNumber) {
String key = "carStop:"+parkVendor+":"+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<String, Object> template,String parkVendor,String carNumber) { public static void setCarCouponUsedCacheLock(RedisTemplate<String, Object> template,String parkVendor,String carNumber) {
String key = "carStop:"+parkVendor+":"+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<String, Object> template,String parkVendor,String carNumber) { public static Integer getCarCouponUseCacheLock(RedisTemplate<String, Object> template,String parkVendor,String carNumber) {


正在加载...
取消
保存