java/IgoTravel.git

			@@ -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);//添加优惠券
			}