From 46e2d6dbef817d415cc4d4ddb5367c3e7e7a0cca Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 3 Aug 2020 09:23:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93code=5Fcustomer?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0SOURCE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.3__thirdUpdate.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.3__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.3__thirdUpdate.sql index f97ef2b681..8be3a5a505 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.3__thirdUpdate.sql +++ b/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; From 7cf7ee39efe3cec807c3e3a0946e3f1e818ea024 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 3 Aug 2020 09:40:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index dd75b620ab..acdd543ed8 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 From a74c21d664e8d1b8694a31772a72bad006579f54 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 3 Aug 2020 09:41:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index c66841f3a4..436dc5a4e0 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 09db8600b6..5fc45f607d 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.91 + 0.0.92 com.epmet From a63cabab91d914292f34c6c6a1fc47f61ff7d704 Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 3 Aug 2020 09:53:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E6=97=B6=E7=A7=AF=E5=88=86=E6=89=A3=E5=87=8F=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=A0=B8=E9=94=80=E6=89=AB=E7=A0=81=E6=97=B6?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=A4=B1=E6=95=88=E7=9A=84=E6=8F=90?= =?UTF-8?q?=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 【】", 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 = "用户二维码失效"; } From 8056e871cadf7c59ee64ecb45b767ef49129958e Mon Sep 17 00:00:00 2001 From: wangchao Date: Mon, 3 Aug 2020 10:02:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=A7=AF=E5=88=86+1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index fd23fbfa8a..b06be7e182 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/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 # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index b03c9f3059..526f37eaa0 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/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"> 4.0.0 - 0.0.16 + 0.0.17 epmet-point com.epmet