合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/messagePush.java

@@ -1,5 +1,11 @@
 package com.community.huiju.common;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
 /**
  * version V1.0
  * class_name: $METHOD_NAME$
@@ -10,7 +16,7 @@ package com.community.huiju.common;
  **/
 public class messagePush {
     public String[]  messagePushAll() {
-        String[] messageArr = new String[13];
+        String[] messageArr= new String[13];
         messageArr[0] = "账号已审核通过，看看下面的消息了解下APP如何使用吧！";
         messageArr[1] = "点击顶部小区名称，切换到其他房产或小区，或关联更多房产";
         messageArr[2] = "点击上方 人脸录入，为自己或家人录入人脸信息，家人未注册可先替TA注册";

CODE/smart-community/app-api/src/main/resources/mapper/TpMessageMapper.xml

@@ -348,7 +348,7 @@
         AND t.uuid_type = 1
         AND t.model_type = #{modelType,jdbcType=INTEGER}
     ORDER BY
-    t.create_date DESC
+    t.create_date DESC , t.id
   </select>
 
   <update id="updateReadStatus" parameterType="java.lang.Integer" >

CODE/smart-community/property-api/src/main/java/com/community/huiju/common/base/messagePush.java

@@ -1,9 +1,4 @@
 package com.community.huiju.common.base;
-import com.community.commom.session.UserElement;
-import com.community.huiju.model.Message;
-import com.community.huiju.model.TaUserVerify;
-
-import java.time.LocalDateTime;
 
 /**
  * version V1.0

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java

@@ -279,6 +279,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             }
 
         }
+        userVerify.setVerifyName(user.getUserName());
         taUserVerifyMapper.updateById(userVerify);
         //推送消息
         String[] messageArr= new messagePush().messagePushAll( );