Преглед изворни кода

message

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
c83c0a16e5
2 измењених фајлова са 7 додато и 7 уклоњено
  1. +4
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  2. +3
    -3
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java

+ 4
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Прегледај датотеку

@@ -327,10 +327,10 @@ public class WxCarController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "广场停车场类型非法."); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "广场停车场类型非法.");
} }
Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, vendor.getMessage(), carNumber);
if (null != used && 1 == used.intValue()) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "已经使用过停车券,不能叠加使用.");
}
// Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, vendor.getMessage(), carNumber);
// if (null != used && 1 == used.intValue()) {
// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "已经使用过停车券,不能叠加使用.");
// }
if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) {
ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber); ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber);


+ 3
- 3
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java Прегледај датотеку

@@ -88,8 +88,8 @@ public class WxCarETCPCallBackController extends BaseController {
public Result etcpParkInCallback(@RequestBody Map<String, String> paramMap) { public Result etcpParkInCallback(@RequestBody Map<String, String> paramMap) {
logger.info("["+getIpAddr()+"] etcpParkInCallback: " + paramMap.toString()); logger.info("["+getIpAddr()+"] etcpParkInCallback: " + paramMap.toString());
String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER); String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER);
ParkCacheUtils.removeCache(redisTemplate, "etcp", carNumber);
ParkCacheUtils.setCarCouponUnUseCacheLock(redisTemplate, "etcp", carNumber);
ParkCacheUtils.removeCache(redisTemplate, "ETCP", carNumber);
ParkCacheUtils.setCarCouponUnUseCacheLock(redisTemplate, "ETCP", carNumber);
doEtcpParkIn(paramMap); doEtcpParkIn(paramMap);


return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage());
@@ -117,7 +117,7 @@ public class WxCarETCPCallBackController extends BaseController {
public Result etcpParkOutCallback(@RequestBody Map<String, String> paramMap) { public Result etcpParkOutCallback(@RequestBody Map<String, String> paramMap) {
logger.info("["+getIpAddr()+"etcpParkOutCallback: " + paramMap.toString()); logger.info("["+getIpAddr()+"etcpParkOutCallback: " + paramMap.toString());
String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER); String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER);
ParkCacheUtils.removeCache(redisTemplate, "etcp", carNumber);
ParkCacheUtils.removeCache(redisTemplate, "ETCP", carNumber);
doEtcpParkOut(paramMap); doEtcpParkOut(paramMap);


return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage()); return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage());


Loading…
Откажи
Сачувај