Compare commits
No commits in common. "91b8ed32f111d1c198fd8e5fb8d134ce67f9b93c" and "8997b9df0b6519ee1a49fbab44020e4209adcedb" have entirely different histories.
91b8ed32f1
...
8997b9df0b
|
@ -621,18 +621,6 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
||||||
messageInfo.setCreateAt(sdf.format(new Date()));
|
messageInfo.setCreateAt(sdf.format(new Date()));
|
||||||
messageInfo.setIsSee("0");
|
messageInfo.setIsSee("0");
|
||||||
messageService.saveBody(messageInfo);
|
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);
|
return getResult(userInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -201,16 +201,7 @@ public class MessageController {
|
||||||
public Result dataSelectXxzx(){
|
public Result dataSelectXxzx(){
|
||||||
QueryWrapper<MessageInfo> qw = new QueryWrapper<>();
|
QueryWrapper<MessageInfo> qw = new QueryWrapper<>();
|
||||||
qw.eq("state",2);
|
qw.eq("state",2);
|
||||||
qw.and(q->q.isNull("is_see").or().ne("is_see",2));
|
qw.and(q->q.isNull("is_see").or().eq("is_see",1));
|
||||||
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));
|
return Result.success().put("data",messageService.count(qw));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,7 +53,7 @@ public class MessageInfo implements Serializable {
|
||||||
* 2 消息
|
* 2 消息
|
||||||
* 4 开通会员、取消会员
|
* 4 开通会员、取消会员
|
||||||
* 5 系统通知(系统通知、提现通知)
|
* 5 系统通知(系统通知、提现通知)
|
||||||
* 6 举报类型配置
|
* 6 举报
|
||||||
* 7 举报
|
* 7 举报
|
||||||
* 8 技师被扣除信誉分
|
* 8 技师被扣除信誉分
|
||||||
* 9 技师电话呼救
|
* 9 技师电话呼救
|
||||||
|
@ -63,7 +63,6 @@ public class MessageInfo implements Serializable {
|
||||||
* 16 新订单通知
|
* 16 新订单通知
|
||||||
* 51 新订单提醒
|
* 51 新订单提醒
|
||||||
* 52 请他上线
|
* 52 请他上线
|
||||||
* 99 新用户注册
|
|
||||||
*/
|
*/
|
||||||
private String state;
|
private String state;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue