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

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.已删除
      */

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;
+
     /**
      * 删除标识
      */

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;
+
     /**
      * 删除标识
      */

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.78
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.79
     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.78</version>
+    <version>0.0.79</version>
 
     <parent>
         <groupId>com.epmet</groupId>

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 = "获取用户信息失败";
     /**
      * 更新用户信息失败
      */

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;
+
 }

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;
+
 }

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;
+
 }

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<PaCustomerDao, PaCust
 
         //2.根据token中的userId查询pa_user表数据，根据手机号是否为空判断后续是新增还是更新user数据
         PaUserEntity paUserEntity = paUserDao.selectById(formDTO.getUserId());
+        if (null == paUserEntity) {
+            logger.error("根据token中userId查询pa_user表信息失败，userId->"+formDTO.getUserId());
+            throw new RenException(PaConstant.SELECT_USER_EXCEPTION);
+        }
 
         //3.手机号不为空说明是同一个微信用户用第二个手机号注册，手机为空说明当前微信用户用第一个手机号注册
         if(StringUtils.isNotBlank(paUserEntity.getPhone())){