From f6fd3607f046744e86f391956d91d0f009bb3adb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 18 八月 2025 22:50:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
index c8c1ed2..97c1c53 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -68,7 +68,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<String> getCode(HttpServletRequest request){
+ public ResultUtil<Map<String,String>> getCode(HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
@@ -78,7 +78,14 @@
if (userInfo.getCode()==null){
userInfo = userInfoService.generateCode(userInfo);
}
- return ResultUtil.success(userInfo.getCode());
+ Map<String, String> res = new HashMap<>();
+ res.put("code",userInfo.getCode());
+ int i = inviteService.selectCount(new EntityWrapper<Invite>()
+ .eq("inviteUserId", uid)
+ .eq("userType", 1));
+
+ res.put("inviteNumber",i+"");
+ return ResultUtil.success(res);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -99,7 +106,7 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil inviteList(String startTime,String endTime,Integer pageNum,Integer size,HttpServletRequest request){
+ public ResultUtil<List<Invite>> inviteList(String startTime,String endTime,Integer pageNum,Integer size,HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
@@ -109,7 +116,16 @@
startTime = startTime + " 00:00:00";
endTime = endTime + " 23:59:59";
}
+ pageNum = (pageNum - 1) * size;
List<Invite> invites = inviteService.inviteList(uid,startTime,endTime,pageNum,size);
+ for (Invite invite : invites) {
+ // 将手机号phone中间四位替换为*
+ String phone = invite.getPhone();
+ if (phone != null && phone.length() > 4) {
+ phone = phone.substring(0, 3) + "****" + phone.substring(7);
+ invite.setPhone(phone);
+ }
+ }
return ResultUtil.success(invites);
}catch (Exception e){
e.printStackTrace();
@@ -305,16 +321,19 @@
@ApiImplicitParam(value = "头像", name = "avatar", required = false, dataType = "String"),
@ApiImplicitParam(value = "昵称", name = "nickName", required = false, dataType = "String"),
@ApiImplicitParam(value = "登录端口-小程序传Applets", name = "loginType", required = false, dataType = "String"),
- @ApiImplicitParam(value = "性别(1=男，2=女)", name = "sex", required = false, dataType = "int")
+ @ApiImplicitParam(value = "性别(1=男，2=女)", name = "sex", required = false, dataType = "int"),
+ @ApiImplicitParam(value = "手机号 获取微信号用", name = "phone", required = false, dataType = "String")
+
})
public ResultUtil<LoginWarpper> wxLogin(Integer type, String openid, String unionid, String jscode, String registIp, String registAreaCode, Integer sex, String nickName, String avatar,String loginType
- ,Integer uid,Integer userType){
+ ,Integer uid,Integer userType,String phone){
try {
- return userInfoService.wxLogin(type, openid, unionid, jscode, registIp, registAreaCode, sex, nickName, avatar,loginType,uid,userType);
+ return userInfoService.wxLogin(type, openid, unionid, jscode, registIp, registAreaCode, sex, nickName, avatar,loginType,uid,userType,phone);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
+
}
--
Gitblit v1.7.1