From a0411ab43d67c1ffcdc0e3f29c260f11936d62b4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Jul 2020 12:18:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8C=BA=E5=88=86=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=AD=97=E6=AE=B5source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/PaCustomerDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/PaUserDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/PaUserVisitedDTO.java | 5 +++++ .../src/main/java/com/epmet/constant/PaConstant.java | 4 ++++ .../src/main/java/com/epmet/entity/PaCustomerEntity.java | 5 +++++ .../src/main/java/com/epmet/entity/PaUserEntity.java | 5 +++++ .../src/main/java/com/epmet/entity/PaUserVisitedEntity.java | 5 +++++ .../java/com/epmet/service/impl/PaCustomerServiceImpl.java | 4 ++++ 8 files changed, 38 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java index dd175f0747..8beef22698 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaCustomerDTO.java @@ -48,6 +48,11 @@ public class PaCustomerDTO implements Serializable { */ private Integer isInitialize; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java index 1a61724055..5961351e0e 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserDTO.java @@ -53,6 +53,11 @@ public class PaUserDTO implements Serializable { */ private String gender; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 删除标识 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java index 84f9601199..d39c1a32df 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/PaUserVisitedDTO.java @@ -58,6 +58,11 @@ public class PaUserVisitedDTO implements Serializable { */ private String phone; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + /** * 删除标识 */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java index c381b4e2f3..7f25762c5e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java @@ -6,6 +6,10 @@ package com.epmet.constant; */ public interface PaConstant { + /** + * 根据userId查询pa_user表失败 + */ + String SELECT_USER_EXCEPTION = "获取用户信息失败"; /** * 更新用户信息失败 */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java index 9c32baf589..71a5cf6fc4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaCustomerEntity.java @@ -48,4 +48,9 @@ public class PaCustomerEntity extends BaseEpmetEntity { */ private Integer isInitialize; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java index 21565600a6..05ec73a6f2 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserEntity.java @@ -53,4 +53,9 @@ public class PaUserEntity extends BaseEpmetEntity { */ private String gender; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java index 4eb51375ba..0aae0e2548 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/PaUserVisitedEntity.java @@ -58,4 +58,9 @@ public class PaUserVisitedEntity extends BaseEpmetEntity { */ private String phone; + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index b7333ae50a..df6c581a92 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -172,6 +172,10 @@ public class PaCustomerServiceImpl extends BaseServiceImpl"+formDTO.getUserId()); + throw new RenException(PaConstant.SELECT_USER_EXCEPTION); + } //3.手机号不为空说明是同一个微信用户用第二个手机号注册，手机为空说明当前微信用户用第一个手机号注册 if(StringUtils.isNotBlank(paUserEntity.getPhone())){