diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java index e22fe14ca6..7ed5afbfe7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java @@ -26,6 +26,10 @@ public class PointRedis { return redisUtils.lindex(RedisKeys.getPointVerificationResultKey(userId),index); } + public Object rpop(String userId){ + return redisUtils.rightPop(RedisKeys.getPointVerificationResultKey(userId)); + } + public String checkIfQrCodeExpire(String shortId){ String userId = (String)redisUtils.getString(RedisKeys.getShortUserIdKey(shortId)); return userId; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index e412c6b6a0..d7f0d379b6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -238,17 +238,18 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl 【】", JSON.toJSON(verificationParam))); - throw new RenException("用户二维码失效"); + result.setSuccessFlag(false); + result.setFailureReason(ModuleConstant.INVALID_USER_QRCDDE); } DimIdGenerator.DimIdBean dim = DimIdGenerator.getDimIdBean(new Date()); - PointVerificationResultDTO result = new PointVerificationResultDTO(); + ResiCommonUserIdFormDTO userId = new ResiCommonUserIdFormDTO(); userId.setUserId(verificationParam.getUserId()); ResiPointDetailResultDTO currentPoint = userPointTotalService.getMyPoint(userId); @@ -328,8 +329,8 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl NumConstant.ZERO){ Integer sum = baseDao.selectSumByEvent(event.getUserId(),eventCode,event.getSourceId(),event.getCustomerId()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java index a0ce1e17b2..d607a11b21 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java @@ -92,4 +92,6 @@ public interface ModuleConstant extends Constant { String POINT_NOT_ENOUGH = "积分余额不足"; String CREATED_BY_SYSTEM = "SYSTEM"; + + String INVALID_USER_QRCDDE = "用户二维码失效"; }