1

doc/DB/compass_db_schema.txt

@@ -149,18 +149,18 @@ DROP TABLE IF EXISTS circle_dat;
 CREATE TABLE IF NOT EXISTS circle_dat(
 	id bigint unsigned NOT NULL PRIMARY KEY auto_increment,
 	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	title text NOT NULL,
+	title varchar(64) NOT NULL,
 	member_count int8 NOT NULL DEFAULT '0',
 	need_check tinyint(1) NOT NULL DEFAULT '0',
 	comment text NOT NULL,
 	longitude text NOT NULL,
-	latitude text NOT NULL DEFAULT 'UNKNOW',
+	latitude text NOT NULL,
 	address text NOT NULL,
 	owner_id int8 NOT NULL DEFAULT '0',
 	delete_flg tinyint(1) NOT NULL DEFAULT '0'
 ) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
 
-Create INDEX circle_dat_title_idx ON circle_dat(title(255));
+Create INDEX circle_dat_title_idx ON circle_dat(title);
 Create INDEX circle_dat_owner_id_idx ON circle_dat(owner_id);
 
 
@@ -172,6 +172,7 @@ CREATE TABLE IF NOT EXISTS circle_member_dat(
 	registration_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	circle_id int8 NOT NULL DEFAULT '0',
 	user_id int8 NOT NULL DEFAULT '0',
+	name varchar(64),
 	delete_flg tinyint(1) NOT NULL DEFAULT '0'
 ) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
 

doc/Server/server.txt

+#php.ini#
+memory_limit = 1280M
+post_max_size = 1000M
+upload_max_filesize = 500M
\ No newline at end of file

src/user/if/ajax_get_user_media_history.php

@@ -9,6 +9,15 @@ ErrorLogger::doOutput("Compass...ajax_get_course_by_category.php....Start.", 0);
 $unionId = ParamUtil::getRequestString("unionId", 0);
 $page = ParamUtil::getRequestNumber("page", 0);
 
+//检索用户是否存在
+$param['unionid'] = $unionId;
+$param['delete_flg'] = false;
+$tmpUserMstList = UserMst::getList($param,'id','desc', 0, 1);
+if(empty($tmpUserMstList)) {
+	responseNG("参数错误！");
+}
+
+$user = $tmpUserMstList[0];
 //每页显示条数
 $rowCount = 10;
 
@@ -18,17 +27,25 @@ $offset = $page * $rowCount;
 
 //检索数据库查询观看记录
 $param = array();
-$param['parent_category_id'] = $parentId;
-$param['sub_category_id'] = $subId;
+$param['user_id'] = $user->id;
 $param['delete_flg'] = false;
-$courseList = CourseMst::getList($param,'id','desc', $offset, $rowCount);
-$allCount = CourseMst::getListCount($param);
+$tmpUserMediaList = UserMediadat::getList($param,'registration_date','desc', $offset, $rowCount);
+$allCount = UserMediadat::getListCount($param);
+
+$userMediaList = array();
+if(!empty($tmpUserMediaList)) {
+	foreach($tmpUserMediaList as $tmpUserMediaDat) {
+		$tmpMediaDat = CourseMediaDat::getById($tmpUserMediaDat->media_id);
+		$tmp = Array("courseId"=>$tmpMediaDat->course_id,"mediaId"=>$tmpMediaDat->id,"title"=>$tmpMediaDat->title, "media"=>$tmpMediaDat->media);
+		$userMediaList[] = $tmp;
+	}
+}
 
 //接口返回数据
 $result["allCount"] = $allCount;
 $result["page"] = $page;
 $result["rowCount"] = $rowCount;
-$result["list"] = $courseList;
+$result["list"] = $userMediaList;
 
 
 ErrorLogger::doOutput("Compass...ajax_get_course_by_category.php....End.", 0);

src/user/if/ajax_set_media_view_count.php

@@ -40,14 +40,26 @@ if($courseMediaDat->is_free) {
 	$courseMediaDat->view_count++;
 	$courseMediaDat->save();
 
-	//添加用户观看记录[此处仅限免费观看视频，收费观看视频在付费的时候更新]
-	$userMediaDat = new UserMediaDat();
-	$userMediaDat->user_id = $user->id;
-	$userMediaDat->course_id = $courseId;
-	$userMediaDat->media_id = $media_id;
-	$userMediaDat->is_free = $courseMediaDat->is_free;
-	$userMediaDat->money = $courseMediaDat->money;
-	$userMediaDat->save();
+	//添加用户观看记录(已经观看过则更新时间变成最后观看)
+	$param['user_id'] = $user->id;
+	$param['course_id'] = $courseId;
+	$param['media_id'] = $mediaId;
+	$param['delete_flg'] = false;
+	$tmpUserMediaDatList = UserMediaDat::getList($param,'id','desc', 0, 1);
+	if(empty($tmpUserMediaDatList)) {
+		//第一次观看则添加记录
+		$userMediaDat = new UserMediaDat();
+		$userMediaDat->user_id = $user->id;
+		$userMediaDat->course_id = $courseId;
+		$userMediaDat->media_id = $media_id;
+		$userMediaDat->is_free = $courseMediaDat->is_free;
+		$userMediaDat->money = $courseMediaDat->money;
+		$userMediaDat->save();
+	} else {
+		//以前有观看记录则修改观看时间
+		$tmpUserMediaDatList[0]->registration_date = date("Y-m-d H:i:s");
+		$tmpUserMediaDatList[0]->save();
+	}
 } else {
 	//收费观看课程