From a63cabab91d914292f34c6c6a1fc47f61ff7d704 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Mon, 3 Aug 2020 09:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A0=B8=E9=94=80=E6=97=B6?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=89=A3=E5=87=8F=E7=9A=84=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B8=E9=94=80=E6=89=AB=E7=A0=81=E6=97=B6=E4=BA=8C?=
 =?UTF-8?q?=E7=BB=B4=E7=A0=81=E5=A4=B1=E6=95=88=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/redis/PointRedis.java  |  4 ++++
 .../impl/PointVerificationLogServiceImpl.java      | 14 ++++++++------
 .../impl/UserPointActionLogServiceImpl.java        |  2 ++
 .../main/java/com/epmet/utils/ModuleConstant.java  |  2 ++
 4 files changed, 16 insertions(+), 6 deletions(-)

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<PointVerifi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public PointVerificationResultDTO verifyPoint(PointVerificationFormDTO verificationParam) {
-
+        PointVerificationResultDTO result = new PointVerificationResultDTO();
         String decodedUserId = pointRedis.checkIfQrCodeExpire(verificationParam.getUserId());
         if(StringUtils.isNotBlank(decodedUserId)){
             verificationParam.setUserId(decodedUserId);
         }else{
             logger.error(String.format("用户二维码失效，参数详情 -> 【】", 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<PointVerifi
         UserPointTotalEntity userPoint = new UserPointTotalEntity();
         userPoint.setUserId(verificationParam.getUserId());
         userPoint.setCustomerId(customerId);
-        //负数
-        userPoint.setTotalPoint(point);
+        //总数不变
+        userPoint.setTotalPoint(NumConstant.ZERO);
         //负数
         userPoint.setUsablePoint(point);
         //正数
@@ -369,7 +370,8 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
      **/
     @Override
     public PointExchangeResponseResultDTO resiExchangeCallback(String userId) {
-        return (PointExchangeResponseResultDTO)pointRedis.lindex(userId,NumConstant.ZERO_L);
+       // return (PointExchangeResponseResultDTO)pointRedis.lindex(userId,NumConstant.ZERO_L);
+       return (PointExchangeResponseResultDTO)pointRedis.rpop(userId);
     }
 
     /**
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
index 352336f071..1d813760ca 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java
@@ -196,6 +196,8 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
 
         PointRuleEntity ruleInfo = pointRuleService.getByEventCodeAndCustomerId(event.getCustomerId(),eventCode);
         if(null != ruleInfo && StringUtils.equals(NumConstant.ONE_STR,ruleInfo.getEnabledFlag())){
+            //判断积分规则的积分单位 次、天、分钟、小时
+
             //校验是否达到上限
             if(ruleInfo.getUpLimit() > 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 = "用户二维码失效";
 }