dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发布通告功能

Browse Source
This commit is contained in:
13405411873 2025-04-24 18:33:22 +08:00
parent 74ab330dd1
commit 064fad7914
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/api/WxApi.java
View File

@ -33,9 +33,9 @@ public class WxApi {
@GetMapping("/getCodeUrl") @GetMapping("/getCodeUrl")
@Anonymous @Anonymous
public Map<String, String> getCodeUrl(String userType) { public Map<String, String> getCodeUrl(String userType,String url) {
Map<String, String> res = new HashMap<>(); Map<String, String> res = new HashMap<>();
res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/pages/mine/member/member-card", userType)); res.put("codeUrl", weChatUtils.getCodeUrl("https://www.ddtg.site/#/"+url, userType));
return res; return res;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java
View File

@ -67,7 +67,7 @@ public interface IMemberUserService extends IService<MemberUser> {
* @author vinjor-M * @author vinjor-M
* @date 15:55 2025/3/26 * @date 15:55 2025/3/26
**/ **/
String wxLogin(String openid, String decryptResult); String wxLogin(String openid, String decryptResult,String unionId);
/** /**
* uniApp保存会员信息 * uniApp保存会员信息

9
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java
View File

@ -160,7 +160,7 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
**/ **/
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public String wxLogin(String openid, String decryptResult) { public String wxLogin(String openid, String decryptResult,String unionid) {
//字符串转json //字符串转json
JSONObject jsonObject = JSONObject.parseObject(decryptResult); JSONObject jsonObject = JSONObject.parseObject(decryptResult);
//手机号 //手机号
@ -171,6 +171,10 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
if(null==wxUser){ if(null==wxUser){
//根据openId没查到，再根据手机号查 //根据openId没查到，再根据手机号查
wxUser = userMapper.selectWxUserByOpenIdOrPhone(null,phone,null,null); wxUser = userMapper.selectWxUserByOpenIdOrPhone(null,phone,null,null);
if(null==wxUser&& StringUtils.isNotEmpty(unionid)){
//根据openId没查到，再根据unionid查
wxUser = userMapper.selectWxUserByOpenIdOrPhone(null,null,null,unionid);
}
} }
//如果查不到，则新增，查到了，则更新 //如果查不到，则新增，查到了，则更新
SysUser user = new SysUser(); SysUser user = new SysUser();
@ -183,6 +187,7 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
user.setPhonenumber(phone); user.setPhonenumber(phone);
user.setSex("2"); user.setSex("2");
user.setCreateTime(DateUtils.getNowDate()); user.setCreateTime(DateUtils.getNowDate());
user.setUnionId(unionid);
//新增 用户 //新增 用户
userMapper.insertUser(user); userMapper.insertUser(user);
//插入用户扩展信息表数据 //插入用户扩展信息表数据
@ -202,6 +207,8 @@ public class MemberUserServiceImpl extends ServiceImpl<MemberUserMapper, MemberU
if(!openid.equals(user.getOpenId())){ if(!openid.equals(user.getOpenId())){
user.setOpenId(openid); user.setOpenId(openid);
user.setUpdateTime(DateUtils.getNowDate()); user.setUpdateTime(DateUtils.getNowDate());
user.setUnionId(unionid);
user.setPhonenumber(phone);
userMapper.updateUser(user); userMapper.updateUser(user);
} }
} }

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -101,7 +101,7 @@ public class SysLoginController
if (StringUtils.hasText(decryptResult)){ if (StringUtils.hasText(decryptResult)){
//如果解析成功,获取token //如果解析成功,获取token
String token = memberUserService.wxLogin(openid,decryptResult); String token = memberUserService.wxLogin(openid,decryptResult,jsonObject.getString("unionid"));
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put(Constants.TOKEN, token); ajax.put(Constants.TOKEN, token);
return ajax; return ajax;