From 39db83364341bf4617e0e8666c6c65e19c55a475 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期六, 09 九月 2023 18:14:06 +0800 Subject: [PATCH] 更新 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java index ba0b6a2..c74a29b 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java @@ -414,6 +414,7 @@ emailService.insert(tEmail); } } + if(type == 1){//用户分享 UserInfo userInfo1 = userInfoMapper.selectById(uid); List<Map<String, Object>> query = userActivityInviteMapper.query(userInfo1.getCompanyId()); @@ -602,6 +603,7 @@ loginWarpper.setId(userInfo.getId()); loginWarpper.setToken(token); loginWarpper.setAppid(UUIDUtil.getRandomCode()); + loginWarpper.setEmail(userInfo.getEmail()); loginWarpper.setEmergencyContact(userInfo.getEmergencyContact()); loginWarpper.setEmergencyContactNumber(userInfo.getEmergencyContactNumber()); return ResultUtil.success(loginWarpper); @@ -927,8 +929,13 @@ @Override - public ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language) throws Exception { - UserInfo userInfo = this.selectOne(new EntityWrapper<UserInfo>().eq("faceBookId", id).ne("flag", 3)); + public ResultUtil facebookLogin(String id, String name, String email, Double lat, Double lng, Integer uid, Integer language,int type) throws Exception { + UserInfo userInfo=null; + if(type==1){ + userInfo = this.selectOne(new EntityWrapper<UserInfo>().eq("faceBookId", id).ne("flag", 3)); + }else { + userInfo = this.selectOne(new EntityWrapper<UserInfo>().eq("twitterId", id).ne("flag", 3)); + } if(null == userInfo){ userInfo = new UserInfo(); userInfo.setEmail(email); @@ -938,7 +945,11 @@ userInfo.setBalance(0D); userInfo.setIntegral(0); userInfo.setPassWord(ShiroKit.md5("", salt)); - userInfo.setFaceBookId(id); + if(type==1){ + userInfo.setFaceBookId(id); + }else { + userInfo.setTwitterId(id); + } userInfo.setState(1); userInfo.setFlag(1); userInfo.setInsertTime(new Date()); @@ -1035,8 +1046,6 @@ } emailService.insert(tEmail); } - - this.addCoupon(userInfo, language);//添加优惠券 } -- Gitblit v1.7.1