1

doc/DB/compass_db_schema.txt

@@ -383,7 +383,7 @@ CREATE TABLE IF NOT EXISTS volunteer_event_dat(
 	leader_name varchar(64) NOT NULL,
 	leader_contact varchar(128) NOT NULL,
 	venue text NOT NULL,
-	status varchar(64) NOT NULL,
+	status varchar(64) NOT NULL DEFAULT 'NEW',
 	delete_flg tinyint(1) NOT NULL DEFAULT '0'
 ) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
 

src/user/if/ajax_get_top_dat.php

@@ -8,6 +8,11 @@ ErrorLogger::doOutput("Compass...ajax_get_top_dat.php....Start.", 0);
 //获取参数
 $unionId = ParamUtil::getRequestString("unionId");
 
+//用户所在【省市区】
+$province = ParamUtil::getRequestString("province");
+$city = ParamUtil::getRequestString("city");
+$district = ParamUtil::getRequestString("district");
+
 $result = array();
 
 //参数检查
@@ -30,22 +35,25 @@ $userMst = $userList[0];
 
 //判断用户身份分别获取数据
 $volunteerEventList = array();
-$socialEventList = array();
+$familyEventList = array();
 $socialEventList = array();
 $mediaList = array();
 
-//[1：家园用户]
-if($userMst->role == 1) {
-	//志愿者活动[首页只显示本校发布的最新一条志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践【家园用户无社会实践】
+//志愿者活动[当前所在区域的第一条志愿者活动]
+$param = array();
+$param['province'] = $province;
+$param['city'] = $city;
+$param['district'] = $district;
+$param['status'] = "OK";
+$param['delete_flg'] = false;
+//社会用户和机构用户的时候，添加【是否允许社会人士参加】
+if($userMst->role == 5 || $userMst->role == 6) {
+	$param['include_social_user'] = true;
+}
+$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
 
+//亲子活动
+if($userMst->role == 1) {
 	//亲子活动
 	$param = array();
 	$param['school_no'] = $userMst->school_no;
@@ -54,89 +62,15 @@ if($userMst->role == 1) {
 	$familyEventList = FamilyEventDat::getList($param,'id','desc', 0, 1);
 }
 
-//[2：家校用户]
+//社会实践
 if($userMst->role == 2) {
-	//志愿者活动[首页只显示本校发布的最新一条志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践
 	$param = array();
 	$param['school_no'] = $userMst->school_no;
 	$param['original_source'] = $userMst->school_no;
 	$param['delete_flg'] = false;
 	$socialEventList = SocialEventDat::getList($param,'id','desc', 0, 1);
-	
-	//亲子活动【家校用户无亲子活动】
-}
-
-//[3：高职用户]
-if($userMst->role == 3) {
-	//志愿者活动[首页只显示本校发布的最新一条志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践【高职用户无亲子活动】
-	//亲子活动【高职用户无亲子活动】
-	//公益课堂
 }
 
-//[4：教育局领导]
-if($userMst->role == 4) {
-	//志愿者活动[首页管辖区域发布的最新一条志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践【高职用户无亲子活动】
-	//亲子活动【高职用户无亲子活动】
-	//公益课堂
-}
-
-//[5：社会用户]
-if($userMst->role == 5 {
-	//志愿者活动[首页显示所在区域内面向社会用户发布的志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['include_social_user'] = true;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践【高职用户无亲子活动】
-	//亲子活动【高职用户无亲子活动】
-}
-
-//[6：机构用户]
-if($userMst->role == 6) {
-	//志愿者活动[首页显示所在区域内面向社会用户发布的志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['include_social_user'] = true;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践【高职用户无亲子活动】
-	//亲子活动【高职用户无亲子活动】
-	//公益课堂
-}
 
 //公益课堂
 $param = array();

src/user/if/ajax_get_user_role.php

@@ -7,6 +7,8 @@ ErrorLogger::doOutput("Compass...ajax_get_user_role.php....Start.", 0);
 
 //获取参数
 $unionId = ParamUtil::getRequestString("unionId");
+$longitude = ParamUtil::getRequestString("longitude");//用户位置的经度
+$latitude = ParamUtil::getRequestString("latitude");//用户位置的纬度
 
 $result = array();
 
@@ -29,12 +31,31 @@ if(empty($userList)) {
 
 $userMst = $userList[0];
 
+
+
 //接口返回数据
 $result["role"] = $userMst->role;
 $result["schoolOwner"] = $userMst->school_owner;
 $result["classOwner"] = $userMst->class_owner;
 $result["governmentId"] = $userMst->government_id;
 
+//调用腾讯LGS服务解析用户地址信息
+$tmpUrl = '/ws/geocoder/v1?key=' . LBS_KEY . '&location=' . $latitude . ',' . $longitude . LBS_SECRET;
+$md5Str = md5($tmpUrl);
+$lbsUrl = 'https://apis.map.qq.com/ws/geocoder/v1?key=' . LBS_KEY . '&location=' . $latitude . ',' . $longitude . '&sig=' . $md5Str;
+$lbsObj =  file_get_contents($lbsUrl);
+$jsonObj = json_decode($lbsObj); //对JSON格式的字符串进行编码
+$lbsArray = get_object_vars($jsonObj);//转换成数组
+$resultObj = $lbsArray['result'];
+//地理位置获取正常的情况下设定。 156：中国代码
+if($lbsArray['status'] == "0" && $resultObj->ad_info->nation_code==156) {
+	//保存到用户当前地理位置中
+	$result["province"] = $resultObj->address_component->province;
+	$result["city"] = $resultObj->address_component->city;
+	$result["district"] = $resultObj->address_component->district;
+}
+
+
 ErrorLogger::doOutput("Compass...ajax_get_user_role.php....End.", 0);
 
 //返回结果

src/user/if/ajax_get_volunteer_event_list.php

@@ -7,11 +7,17 @@ ErrorLogger::doOutput("Compass...ajax_get_volunteer_event_list.php....Start.", 0
 
 //获取参数
 $unionId = ParamUtil::getRequestString("unionId");
+
+//用户所在【省市区】
+$province = ParamUtil::getRequestString("province");
+$city = ParamUtil::getRequestString("city");
+$district = ParamUtil::getRequestString("district");
+
+//翻页
 $page = ParamUtil::getRequestNumber("page", 0);//翻页
 
 $result = array();
 
-
 //参数检查
 if(empty($unionId)) {
 	$result["message"] = "参数错误！";
@@ -34,87 +40,25 @@ $offset = $page * $rowCount;
 
 $userMst = $userList[0];
 
-//判断用户身份分别获取数据
-$volunteerEventList = array();
-
-//[1：家园用户]
-if($userMst->role == 1) {
-	//志愿者活动[列表显示：本校志愿者活动 + 领导机构发布的包含本区域的志愿者活动+社会机构发布的面向本区域的志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-}
-
-//[2：家校用户]
-if($userMst->role == 2) {
-	//志愿者活动[首页只显示本校发布的最新一条志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['status'] = "OK";
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-	
-	//社会实践
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['delete_flg'] = false;
-	$socialEventList = SocialEventDat::getList($param,'id','desc', 0, 1);
-	
-	//亲子活动【家校用户无亲子活动】
-}
-
-//[3：高职用户]
-if($userMst->role == 3) {
-	//志愿者活动[首页只显示本校发布的最新一条志愿者活动]
-	$param = array();
-	$param['school_no'] = $userMst->school_no;
-	$param['original_source'] = $userMst->school_no;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-}
-
-//[4：教育局领导]
-if($userMst->role == 4) {
-	//志愿者活动[首页管辖区域发布的最新一条志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-}
-
-//[5：社会用户]
-if($userMst->role == 5 {
-	//志愿者活动[首页显示所在区域内面向社会用户发布的志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
-	$param['include_social_user'] = true;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
-}
-
-//[6：机构用户]
-if($userMst->role == 6) {
-	//志愿者活动[首页显示所在区域内面向社会用户发布的志愿者活动]
-	$param = array();
-	$param['province'] = $userMst->province;
-	$param['city'] = $userMst->city;
-	$param['district'] = $userMst->district;
+//志愿者活动
+$param = array();
+$param['province'] = $province;
+$param['city'] = $city;
+$param['district'] = $district;
+$param['status'] = "OK";
+$param['delete_flg'] = false;
+//社会用户和机构用户的时候，添加【是否允许社会人士参加】
+if($userMst->role == 5 || $userMst->role == 6) {
 	$param['include_social_user'] = true;
-	$param['delete_flg'] = false;
-	$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', 0, 1);
 }
+$volunteerEventList = VolunteerEventDat::getList($param,'id','desc', $offset, $rowCount);
+$volunteerEvenCount = VolunteerEventDat::getListCount($param);
 
 
 //组装返回数据
+$result["rowCount"] = $rowCount;
+$result["page"] = $page;
+$result["volunteerEvenCount"] = $volunteerEvenCount;
 $result["volunteerEventList"] = $volunteerEventList;
 
 ErrorLogger::doOutput("Compass...ajax_get_volunteer_event_list.php....End.", 0);

src/user/if/ajax_social_user_register1.php

@@ -45,11 +45,14 @@ $lbsObj =  file_get_contents($lbsUrl);
 $jsonObj = json_decode($lbsObj); //对JSON格式的字符串进行编码
 $lbsArray = get_object_vars($jsonObj);//转换成数组
 $resultObj = $lbsArray['result'];
+
+/**
 if($lbsArray['status'] == "0" && $resultObj->ad_info->nation_code==156) {
 	print_r($resultObj->address_component->city);
 	print_r($resultObj->address_component->province);
 	print_r($resultObj->address_component->district);
 }
+*/
 
 
 //用户数据插入