Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

epmet-auth/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.65
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.66
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.16
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.17
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.16</version>
+    <version>0.0.17</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

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

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.91
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.92
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.91</version>
+    <version>0.0.92</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.3__thirdUpdate.sql

@@ -1,3 +1,4 @@
 alter table pa_user add SOURCE varchar(32) comment '数据来源(dev:开发 test:体验 prod:生产)' NOT NULL;
 alter table pa_user_visited add SOURCE varchar(32) comment '数据来源(dev:开发 test:体验 prod:生产)' NOT NULL;
 alter table pa_customer add SOURCE varchar(32) comment '数据来源(dev:开发 test:体验 prod:生产)' NOT NULL;
+alter table code_customer add SOURCE varchar(32) comment '数据来源(dev:开发 test:体验 prod:生产)' NOT NULL;