From d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:59:44 +0800
Subject: [PATCH] 合并代码处理冲突
---
cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java | 78 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 1 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index a4ea4d4..58f08bf 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -1,7 +1,12 @@
package com.dsh.account.service;
import com.dsh.account.entity.TAppUser;
+import com.dsh.account.model.AddAppUserVo;
+import com.dsh.account.model.JoinPlayPaiVo;
+import com.dsh.account.model.LoginSMSCodeVo;
+import com.dsh.account.model.LoginWeChatVo;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
+import com.dsh.account.util.ResultUtil;
import com.baomidou.mybatisplus.extension.service.IService;
/**
@@ -14,5 +19,76 @@
*/
public interface TAppUserService extends IService<TAppUser> {
- ClassInfoVo queryUserOfStus(Integer id);
+ ClassInfoVo queryUserOfStus(Integer id,String longitude,String latitude);
+
+
+ /**
+ * 获取短信验证码
+ * @param type
+ * @param phone
+ * @return
+ * @throws Exception
+ */
+ ResultUtil getSMSCode(Integer type, String phone) throws Exception;
+
+
+ /**
+ * 注册账号
+ * @return
+ * @throws Exception
+ */
+ ResultUtil addAppUser(AddAppUserVo addAppUserVo) throws Exception;
+
+
+ /**
+ * 账号密码登录
+ * @param phone
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ ResultUtil loginPassword(String phone, String password) throws Exception;
+
+
+ /**
+ * 验证码登录
+ * @return
+ * @throws Exception
+ */
+ ResultUtil loginSMSCode(LoginSMSCodeVo loginSMSCodeVo) throws Exception;
+
+
+ /**
+ * 微信登录
+ * @return
+ * @throws Exception
+ */
+ ResultUtil loginWechat(LoginWeChatVo loginWechatVo) throws Exception;
+
+
+ /**
+ * 修改密码
+ * @param phone
+ * @param code
+ * @param password
+ * @return
+ * @throws Exception
+ */
+ ResultUtil updatePassword(String phone, String code, String password) throws Exception;
+
+
+ /**
+ * 定时任务修改到期会员的状态
+ */
+ void membershipEnd();
+
+
+ /**
+ * 获取加入玩湃首页数据
+ * @param lon
+ * @param lat
+ * @return
+ * @throws Exception
+ */
+ JoinPlayPaiVo queryJoinPlayPai(Integer uid, String lon, String lat) throws Exception;
}
--
Gitblit v1.7.1