java/qijisheng.git

			@@ -1,5 +1,7 @@
			package com.ruoyi.account.service.impl;

			import com.alibaba.fastjson.JSON;
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.account.api.model.AppUserShop;
			@@ -7,9 +9,11 @@
			import com.ruoyi.account.api.model.AppUser;
			import com.ruoyi.account.service.AppUserService;
			import com.ruoyi.account.service.AppUserShopService;
			import com.ruoyi.account.util.weChat.WXCore;
			import com.ruoyi.account.util.weChat.WeChatUtil;
			import com.ruoyi.account.vo.*;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.redis.service.RedisService;
			import com.ruoyi.common.security.service.TokenService;
			import com.ruoyi.other.api.domain.Shop;
			@@ -73,11 +77,19 @@
			return R.fail(map.get("msg").toString());
			}
			String openid = map.get("openid").toString();
			String sessionKey = map.get("sessionKey").toString();
			//查询用户是否注册，没有注册则跳转到注册页面
			AppUser appUser = this.getOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getWxOpenid, openid).ne(AppUser::getStatus, 3).eq(AppUser::getDelFlag, 0));
			if(null == appUser){
			String decrypt = WXCore.decrypt(appletLogin.getEncryptedData_phone(), sessionKey, appletLogin.getIv_phone());
			if (StringUtils.isEmpty(decrypt)) {
			return R.fail("获取手机信息失败");
			}
			JSONObject phone = JSON.parseObject(decrypt);
			String purePhoneNumber = phone.getString("purePhoneNumber");
			LoginVo loginVo = new LoginVo();
			loginVo.setSkipPage(2);
			loginVo.setPhone(purePhoneNumber);
			return R.ok(loginVo);
			}
			//账户被冻结，给出提示
			@@ -117,6 +129,7 @@
			if(null == appUser){
			LoginVo loginVo = new LoginVo();
			loginVo.setSkipPage(2);
			loginVo.setPhone(mobileLogin.getPhone());
			return R.ok(loginVo);
			}
			//账户被冻结，给出提示