Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -621,6 +621,18 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
             messageInfo.setCreateAt(sdf.format(new Date()));
             messageInfo.setIsSee("0");
             messageService.saveBody(messageInfo);
+            //新增消息：新用户注册
+            {
+                messageInfo = new MessageInfo();
+                messageInfo.setContent("新用户账号注册成功！");
+                messageInfo.setTitle(phone);
+                messageInfo.setState(String.valueOf(99));
+                messageInfo.setUserName(userInfo.getUserName());
+                messageInfo.setUserId(String.valueOf(userInfo.getUserId()));
+                messageInfo.setCreateAt(sdf.format(new Date()));
+                messageInfo.setIsSee("0");
+                messageService.saveBody(messageInfo);
+            }
             return getResult(userInfo);
         }
     }

src/main/java/com/sqx/modules/message/controller/MessageController.java

@@ -201,7 +201,16 @@ public class MessageController {
     public Result dataSelectXxzx(){
         QueryWrapper<MessageInfo> qw = new QueryWrapper<>();
         qw.eq("state",2);
-        qw.and(q->q.isNull("is_see").or().eq("is_see",1));
+        qw.and(q->q.isNull("is_see").or().ne("is_see",2));
+        return Result.success().put("data",messageService.count(qw));
+    }
+
+    @GetMapping("/dataSelectXyhzc")
+    @ApiOperation("获取新用户注册数据")
+    public Result dataSelectXyhzc(){
+        QueryWrapper<MessageInfo> qw = new QueryWrapper<>();
+        qw.eq("state",99);
+        qw.and(q->q.isNull("is_see").or().ne("is_see",2));
         return Result.success().put("data",messageService.count(qw));
     }
 }

src/main/java/com/sqx/modules/message/entity/MessageInfo.java

@@ -53,7 +53,7 @@ public class MessageInfo implements Serializable {
      * 2 消息
      * 4 开通会员、取消会员
      * 5 系统通知（系统通知、提现通知）
-     * 6 举报
+     * 6 举报类型配置
      * 7 举报
      * 8 技师被扣除信誉分
      * 9 技师电话呼救
@@ -63,6 +63,7 @@ public class MessageInfo implements Serializable {
      * 16 新订单通知
      * 51 新订单提醒
      * 52 请他上线
+     * 99 新用户注册
      */
     private String state;