java/zhihuishenqu.git

			@@ -886,6 +886,14 @@
			if (sysUserDO.getBindingCheckUnitId() != null) {
			loginUserInfoVO.setBackstageType(4);
			}
			//判断是否是商家账号
			Long storeId = userDao.selectStoreIdIdByUserId(sysUserDO.getUserId());
			if (null != storeId){
			loginUserInfoVO.setBackstageUserId(sysUserDO.getUserId());
			loginUserInfoVO.setBackstageType(5);
			loginUserInfoVO.setStoreIdId(storeId);
			}

			return R.ok(loginUserInfoVO);
			}

			@@ -3408,7 +3416,7 @@
			}
			Map<String, String> headerMap = new HashMap<>();
			headerMap.put("appid", appId);
			String resultJson = HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "&timestamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
			String resultJson = HttpClientUtil.get("https://uu-api.imashuo.com/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "&timestamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
			JSONObject result = JSON.parseObject(resultJson);
			if (result.get("status").equals(1)) {
			return R.ok(result.get("data"));
			@@ -3768,16 +3776,16 @@
			@Override
			public R getAllCommunityList() {
			List<Integer> areaList = areaCodeList();
			List<AreaVOS> areaVOList = new ArrayList<>();
			List<AreaVOStr> areaVOList = new ArrayList<>();
			for (Integer code : areaList) {
			AreaVOS areaVO = new AreaVOS();
			areaVO.setId(code);
			AreaVOStr areaVO = new AreaVOStr();
			areaVO.setId(code+"");
			areaVO.setName(areaCodeToName(code.longValue()));
			List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
			Iterator<StreetVOS> iterator = streetVOS.listIterator();
			List<StreetVOStr> streetVOS = userDao.selectStreetByAreaCodeStr(code);
			Iterator<StreetVOStr> iterator = streetVOS.listIterator();
			while (iterator.hasNext()) {
			StreetVOS vo = iterator.next();
			List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
			StreetVOStr vo = iterator.next();
			List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(Long.parseLong(vo.getId()), 3);
			vo.setChildList(communityVOS);

			}