From acc200a54e99a003d0e9817ba79ba63ea7bcd8bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=84=B1?= Date: Sun, 22 Dec 2019 18:44:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ifish/serviceImpl/UserServiceImpl.java | 101 ++---------------- 1 file changed, 10 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java index 4b08896..ea946bd 100644 --- a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java @@ -503,7 +503,10 @@ public class UserServiceImpl implements UserService { userWechat.setUserPassword(password); } List deviceUserListWechat = deviceUserDao.findByProperty(Restrictions.eq("priId.userId", userWechat.getUserId())); - List deviceUserListPhone = deviceUserDao.findByProperty(Restrictions.eq("priId.userId", userPhone.getUserId())); + List deviceUserListPhone = new ArrayList<>(1); + if (userPhone != null) { + deviceUserListPhone = deviceUserDao.findByProperty(Restrictions.eq("priId.userId", userPhone.getUserId())); + } for(DeviceUser deviceUser:deviceUserListWechat){ for (DeviceUser devicePhone : deviceUserListPhone) { //如果 手机账号中存在设备 @@ -530,7 +533,11 @@ public class UserServiceImpl implements UserService { } } List cameraUserListWechat = cameraUserDao.findByProperty(Restrictions.eq("cameraUserId.userId", userWechat.getUserId())); - List cameraUserListPhone = cameraUserDao.findByProperty(Restrictions.eq("cameraUserId.userId", userPhone.getUserId())); + List cameraUserListPhone = new ArrayList<>(1); + if (userPhone != null) { + cameraUserListPhone = cameraUserDao.findByProperty(Restrictions.eq("cameraUserId.userId", userPhone.getUserId())); + } + for(CameraUser cameraUser:cameraUserListWechat){ for (CameraUser cameraPhone : cameraUserListPhone) { //如果 手机账号中存在设备 @@ -565,95 +572,7 @@ public class UserServiceImpl implements UserService { userDao.update(userWechat); } - //用户资产信息 - UserAssetDto userAssetDtoWechat = getUserAssetInfo(userWechat.getUserId()); - UserAssetDto userAssetDtoPhone = getUserAssetInfo(userPhone.getUserId()); - //设置经验值 - userAssetDtoPhone.setGoldValue(new BigDecimal(userAssetDtoWechat.getGoldValue().intValue() + userAssetDtoPhone.getGoldValue().intValue())); - if (userAssetDtoPhone.getGoldValue().intValue() <= 0 && userAssetDtoPhone.getGoldValue().intValue() < 7) { - userAssetDtoPhone.setGradeNum(0); - userAssetDtoPhone.setGradeName("小虾米"); - } else if (userAssetDtoPhone.getGoldValue().intValue() <= 7 && userAssetDtoPhone.getGoldValue().intValue() < 70) { - userAssetDtoPhone.setGradeNum(0); - userAssetDtoPhone.setGradeName("小飞鱼"); - } else if (userAssetDtoPhone.getGoldValue().intValue() <= 70 && userAssetDtoPhone.getGoldValue().intValue() < 170) { - userAssetDtoPhone.setGradeNum(1); - userAssetDtoPhone.setGradeName("横行蟹"); - } else if (userAssetDtoPhone.getGoldValue().intValue() <= 170 && userAssetDtoPhone.getGoldValue().intValue() < 370) { - userAssetDtoPhone.setGradeNum(2); - userAssetDtoPhone.setGradeName("海夜叉"); - } else if (userAssetDtoPhone.getGoldValue().intValue() <= 370 && userAssetDtoPhone.getGoldValue().intValue() < 670) { - userAssetDtoPhone.setGradeNum(3); - userAssetDtoPhone.setGradeName("龟丞相"); - } else if (userAssetDtoPhone.getGoldValue().intValue() <= 670 && userAssetDtoPhone.getGoldValue().intValue() < 1070) { - userAssetDtoPhone.setGradeNum(5); - userAssetDtoPhone.setGradeName("小白龙"); - } else if (userAssetDtoPhone.getGoldValue().intValue() <= 1070 && userAssetDtoPhone.getGoldValue().intValue() < 1570) { - userAssetDtoPhone.setGradeNum(7); - userAssetDtoPhone.setGradeName("海龙王"); - } - //技威参数 - GwellParamDto gwellParam = getGwellInfo(userWechat.getIsRegisterGwell(), userWechat.getWechatUnionid()); - if(gwellParam!=null){ - userWechat.setIsRegisterGwell(gwellParam.getIsRegisterGwell()); - userWechat.setP2PVerifyCode1(gwellParam.getP2PVerifyCode1()); - userWechat.setP2PVerifyCode2(gwellParam.getP2PVerifyCode2()); - userWechat.setGwellUserID(gwellParam.getUserID()); - } - Integer userId = userWechat.getUserId(); - StringBuffer msg = new StringBuffer(); - msg.append("感谢您使用爱鱼奇，连接智能设备请查看下方说明书，内含操作视频：http://u.eqxiu.com/s/KmmVl87l\n"); - msg.append("摄像头售后：18667812003\n睿芯插排售后：15757401229\n绚多插排售后：18857689069\n松诺插排售后：13392205468"); - //如果当前设备用户未注册 - if (userWechat.getIsRegisterNetease().equals(BooleanEnum.NO.getKey())) { - PushList pushList = new PushList(); - pushList.setUserId(userId); - pushList.setDeviceId(0); - pushList.setPhoneType("ALL"); - pushList.setShowName(""); - pushList.setPushType(PushTypeEnum.qu_reply.getKey()); - pushList.setPushTitle("系统通知"); - pushList.setPushContext(msg.toString()); -// sendPushQueueMessage(pushList); - //更新用户注册信息 - userWechat.setIsRegisterNetease(BooleanEnum.YES.getKey()); - userDao.update(userWechat); - } - //更新登陆参数 - userDao.executeLoginUpdate(userId,userWechat.getLoginType()); - //用户基本信息 - UserInfoDto userInfoDto = getUserInfoDto(userWechat, gwellParam); - //用户资产信息 - UserAssetDto userAssetDto = getUserAssetInfo(userId); - //返回json信息 - JSONObject json = new JSONObject(); - json.put("userInfo", userInfoDto); - json.put("userAsset", userAssetDto); - //设备信息 - DeviceInfoDto deviceInfo = getDeviceInfo(userWechat.getUserId()); - /** - * 登录返回信息 - */ - //用户信息 - json.put("user", getUserInfo(userWechat,gwellParam)); - //用户资产 - json.put("userAsset", getUserAssetInfo(userId)); - //金币任务 - json.put("goldTasks", getGoldTaskList(userId)); - - //资讯信息 - json.put("information", cacheService.getInformation()); - //设备信息 - json.put("device", deviceInfo.getDeviceList()); - //摄像头信息 - json.put("camera", getCameraInfo(userId)); - //设备关联摄像头信息 - json.put("deviceCamera", getDeviceCamera(deviceInfo.getDeviceIds())); - //商家信息(自己是商家) - json.put("shopsInfo", getShopsInfo(userId,userWechat.getUserImg())); - //看护商家信息 - json.put("shopsInfo2", getShopsInfo(userWechat.getShopsUserId(),null)); - return new JsonResult(ResultEnum.success.getKey(), json); + return wechatValidate(unionId); } public void updateData(String sql){