Merge remote-tracking branch 'origin/master'

puzhibing

2023-09-09 49ffecc181ee442546864c0eb78ba9be66cede15

 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());
@@ -928,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);
@@ -939,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());
@@ -1036,8 +1046,6 @@
                }
                emailService.insert(tEmail);
            }


            this.addCoupon(userInfo, language);//添加优惠券
        }