Merge remote-tracking branch 'origin/dev_bugfix' into dev

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;

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);
     }
 
     /**

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());

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 = "用户二维码失效";
 }