Skip to content

C
Compass
Commit b582c110 by biao
Options

11

parent f6cc3b1f
Showing with 517 additions and 16 deletions
doc/DB/compass_db_schema.txt
......@@ -157,7 +157,9 @@ CREATE TABLE IF NOT EXISTS circle_dat(
comment text,
longitude text NOT NULL,
latitude text NOT NULL,
address text NOT NULL,
province varchar(64) NOT NULL,
city varchar(64) NOT NULL,
district varchar(64) NOT NULL,
owner_id int8 NOT NULL DEFAULT '0',
delete_flg tinyint(1) NOT NULL DEFAULT '0'
) ENGINE = INNODB DEFAULT CHARSET=utf8mb4;
......@@ -236,7 +238,8 @@ CREATE TABLE IF NOT EXISTS user_message_dat(
user_id int8 NOT NULL DEFAULT '0',
title varchar(128) NOT NULL,
comment text,
attach_dat_text text,
attach_dat_type text,
attach_dat_id int8 NOT NULL DEFAULT '0',
attach_dat_path text,
is_read tinyint(1) NOT NULL DEFAULT '0',
delete_flg tinyint(1) NOT NULL DEFAULT '0'
......
doc/DB/t_wy_kindergarten.sql 0 → 100644
/*
Navicat Premium Data Transfer
Source Server : al-rds
Source Server Type : MySQL
Source Server Version : 50670
Source Host : rm-bp1o9djohok39tn53478.mysql.rds.aliyuncs.com:3306
Source Schema : jiazhangxuexiao
Target Server Type : MySQL
Target Server Version : 50670
File Encoding : 65001
Date: 26/02/2020 16:21:34
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for t_wy_kindergarten
-- ----------------------------
DROP TABLE IF EXISTS `t_wy_kindergarten`;
CREATE TABLE `t_wy_kindergarten` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(300) NOT NULL,
`pro` int(10) DEFAULT NULL,
`city` int(10) DEFAULT NULL,
`area` int(10) DEFAULT NULL,
`sale_id` int(11) DEFAULT NULL,
`is_delete` tinyint(1) DEFAULT '0',
`class_num` int(11) DEFAULT NULL,
`recvname` varchar(20) DEFAULT NULL COMMENT '接收人',
`recvtel` varchar(12) DEFAULT NULL COMMENT '接收人电话',
`recvaddress` varchar(100) DEFAULT NULL COMMENT '接收人地址',
`recvmethod` varchar(50) DEFAULT NULL COMMENT '接收方式',
`true_del` tinyint(4) DEFAULT '0' COMMENT '完全删除',
`ischeck` tinyint(2) NOT NULL DEFAULT '1',
`id_photo` int(11) DEFAULT '0',
`school_type` tinyint(2) NOT NULL DEFAULT '1',
`headquarters` varchar(255) DEFAULT NULL,
`phone` varchar(50) DEFAULT NULL,
`kindergarten` varchar(255) DEFAULT NULL,
`creator` int(11) DEFAULT NULL,
`lastadd` varchar(100) DEFAULT NULL,
`create_time` timestamp NULL DEFAULT NULL,
`practice_update_time` timestamp NULL DEFAULT NULL,
`postal_code` int(11) DEFAULT NULL COMMENT '学校邮编',
`nickname_edit` tinyint(1) DEFAULT '0',
`allgrade` varchar(255) DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=2419 DEFAULT CHARSET=utf8;
SET FOREIGN_KEY_CHECKS = 1;
src/cn/compass/entity/CircleDat.inc
......@@ -15,7 +15,9 @@ class CircleDat extends CompassDynamicData
var $comment;
var $longitude;
var $latitude;
var $address;
var $province;
var $city;
var $district;
var $owner_id;
var $delete_flg;
......@@ -36,7 +38,9 @@ class CircleDat extends CompassDynamicData
$this->comment = $record["comment"];
$this->longitude = $record["longitude"];
$this->latitude = $record["latitude"];
$this->address = $record["address"];
$this->province = $record["province"];
$this->city = $record["city"];
$this->district = $record["district"];
$this->owner_id = $record["owner_id"];
$this->delete_flg = $record["delete_flg"];
}
......@@ -109,7 +113,9 @@ class CircleDat extends CompassDynamicData
ParamUtil::copyObj2ArrayNullField($v_param, $this, "comment");
ParamUtil::copyObj2Array($v_param, $this, "longitude");
ParamUtil::copyObj2Array($v_param, $this, "latitude");
ParamUtil::copyObj2Array($v_param, $this, "address");
ParamUtil::copyObj2Array($v_param, $this, "province");
ParamUtil::copyObj2Array($v_param, $this, "city");
ParamUtil::copyObj2Array($v_param, $this, "district");
ParamUtil::copyObj2Array($v_param, $this, "owner_id");
ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
......
src/cn/compass/entity/UserMessageDat.inc
......@@ -11,7 +11,8 @@ class UserMessageDat extends CompassDynamicData
var $user_id;
var $title;
var $comment;
var $attach_dat_text;
var $attach_dat_type;
var $attach_dat_id;
var $attach_dat_path;
var $is_read;
var $delete_flg;
......@@ -29,7 +30,8 @@ class UserMessageDat extends CompassDynamicData
$this->user_id = $record["user_id"];
$this->title = $record["title"];
$this->comment = $record["comment"];
$this->attach_dat_text = $record["attach_dat_text"];
$this->attach_dat_type = $record["attach_dat_type"];
$this->attach_dat_id = $record["attach_dat_id"];
$this->attach_dat_path = $record["attach_dat_path"];
$this->is_read = $record["is_read"];
$this->delete_flg = $record["delete_flg"];
......@@ -99,7 +101,8 @@ class UserMessageDat extends CompassDynamicData
ParamUtil::copyObj2Array($v_param, $this, "user_id");
ParamUtil::copyObj2Array($v_param, $this, "title");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "comment");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "attach_dat_text");
ParamUtil::attach_dat_type($v_param, $this, "attach_dat_type");
ParamUtil::attach_dat_id($v_param, $this, "attach_dat_id");
ParamUtil::copyObj2ArrayNullField($v_param, $this, "attach_dat_path");
ParamUtil::copyObj2Array($v_param, $this, "is_read");
ParamUtil::copyObj2Array($v_param, $this, "delete_flg");
......
src/user/if/ajax_attend_volunteer_event_circle.php
......@@ -36,7 +36,7 @@ if(empty($volunteerDat)) {
$userMst = $userList[0];
//是否已经报名参加
//是否已经报名
$param = array();
$param['volunteer_event_id'] = $userMst->id;
$param['user_id'] = $userMst->id;
......@@ -47,21 +47,55 @@ if(!empty($tmpList)) {
responseNG($result);
}
//该活动已经报名人数
//查找圈子信息
$param = array();
$param['owner_id'] = $userMst->id;
$param['delete_flg'] = false;
$tmpCircleDatList = CircleDat::getList($param, "id", "asc", 0, 1);
if(empty($tmpCircleDatList)) {
$result["message"] = "不是圈主！";
responseNG($result);
}
$circleDat = $tmpCircleDatList[0];
//报名顺序
$param = array();
$param['volunteer_event_id'] = $userMst->id;
$param['delete_flg'] = false;
$tmpCount = VolunteerEventMemberDat::getListCount($param);
$indexNo = sprintf("%05d", $tmpCount);
$indexNo = sprintf("%05d", $tmpCount+1);
//报名表插入数据
$volunteerEventMemberDat = new VolunteerEventMemberDat();
$volunteerEventMemberDat->volunteer_event_id = $volunteerDat->id;
$volunteerEventMemberDat->user_id = $userMst->id;
$volunteerEventMemberDat->circle_id = $circleDat->id;
$volunteerEventMemberDat->is_owner = true;
$volunteerEventMemberDat->index_no = $indexNo;
$volunteerEventMemberDat->mobile = $userMst->mobile;
$volunteerEventMemberDat->save();
//查找圈子成员，给圈子成员发送邀请消息
$param = array();
$param['circle_id'] = $circleDat->id;
$param['user_id_NOT'] = $userMst->id;//不包含自己
$param['delete_flg'] = false;
$tmpCircleMemberList = CircleMemberDat::getListCount($param);
if(!empty($tmpCircleMemberList)) {
foreach(tmpCircleMemberList as $tmpCircleMember) {
$userMessageDat = new UserMessageDat();
$userMessageDat->user_id = $tmpCircleMember->user_id;
$userMessageDat->title = "活动参加邀请通知";
$userMessageDat->comment = "嘀嘀嘀！圈主邀请您参加活动，快点击进入，参加报名吧！";
//添加附件附件
$userMessageDat->attach_dat_type = "VOLUNTEER";
$userMessageDat->attach_dat_id = $circleDat->id;
$userMessageDat->attach_dat_path = "pages/volunteersEventDetail/volunteersEventDetail?volunteersEventId={$circleDat->id}&circleId{$circleDat->id}";
}
}
ErrorLogger::doOutput("Compass...ajax_attend_volunteer_event_circle.php....End.", 0);
//返回结果
......
src/user/if/ajax_attend_volunteer_event_personal.php
......@@ -8,6 +8,7 @@ ErrorLogger::doOutput("Compass...ajax_attend_volunteer_event_personal.php....Sta
//获取参数
$unionId = ParamUtil::getRequestString("unionId");
$eventId = ParamUtil::getRequestNumber("eventId", 0);
$circleId = ParamUtil::getRequestNumber("circleId", 0);//受邀请参加的时候带有此参数
$result = array();
......@@ -52,7 +53,7 @@ $param = array();
$param['volunteer_event_id'] = $userMst->id;
$param['delete_flg'] = false;
$tmpCount = VolunteerEventMemberDat::getListCount($param);
$indexNo = sprintf("%05d", $tmpCount);
$indexNo = sprintf("%05d", $tmpCount+1);
//报名表插入数据
$volunteerEventMemberDat = new VolunteerEventMemberDat();
......@@ -60,6 +61,12 @@ $volunteerEventMemberDat->volunteer_event_id = $volunteerDat->id;
$volunteerEventMemberDat->user_id = $userMst->id;
$volunteerEventMemberDat->index_no = $indexNo;
$volunteerEventMemberDat->mobile = $userMst->mobile;
//通过圈子邀请加入的时候
if($circleId > 0) {
$volunteerEventMemberDat->circle_id = $circleId;
$volunteerEventMemberDat->is_owner = false;
}
$volunteerEventMemberDat->save();
ErrorLogger::doOutput("Compass...ajax_attend_volunteer_event_personal.php....End.", 0);
......
src/user/if/ajax_cancel_volunteer_event.php 0 → 100644
<?php
// 取消志愿者活动报名
require_once ("../user_include.inc");
ErrorLogger::doOutput("Compass...ajax_cancel_volunteer_event_personal.php....Start.", 0);
//获取参数
$unionId = ParamUtil::getRequestString("unionId");
$eventId = ParamUtil::getRequestNumber("eventId", 0);
$result = array();
//参数检查
if(empty($unionId)) {
$result["message"] = "参数错误！";
responseNG($result);
}
//判断用户是否存在
$param = array();
$param['unionid'] = $unionId;
$param['delete_flg'] = false;
$userList = UserMst::getList($param,'id','desc', 0, 1);
if(empty($userList)) {
$result["message"] = "用户不存在！";
responseNG($result);
}
//查询志愿者活动
$volunteerDat = VolunteerEventDat::getById($eventId);
if(empty($volunteerDat)) {
$result["message"] = "参数错误！";
responseNG($result);
}
$userMst = $userList[0];
//是否已经报名参加
$param = array();
$param['volunteer_event_id'] = $eventId;
$param['user_id'] = $userMst->id;
$param['delete_flg'] = false;
$tmpVolunteerEventMemberList = VolunteerEventMemberDat::getList($param, "id", "desc", 0, 1);
if(empty($tmpVolunteerEventMemberList)) {
$result["message"] = "数据错误！";
responseNG($result);
}
$volunteerEventMemberDat = $tmpVolunteerEventMemberList[0];
//个人报名直接取消
if($volunteerEventMemberDat->circle_id == 0) {
$volunteerEventMemberDat->delete_flg = true;
$volunteerEventMemberDat->save();
} else {
//圈子报名
if($volunteerEventMemberDat->is_owner) {
//圈主取消的情况下，取消所有成员报名
$circleId = $volunteerEventMemberDat->circle_id;
$sql = "update volunteer_event_member_dat set delete_flg=true where delete_flg=false and volunteer_event_id='{$eventId}' and circle_id='{$circleId}'";
$db = &CompassDBManager::getInstance();
$db->executeQuery($from.$sql_where);
} else {
//成员取消参加，之取消自己的的参加
$volunteerEventMemberDat->delete_flg = true;
$volunteerEventMemberDat->save();
}
}
ErrorLogger::doOutput("Compass...ajax_cancel_volunteer_event_personal.php....End.", 0);
//返回结果
$result["message"] = "取消成功！";
responseOK($result);
function responseNG($result) {
$result = array("status"=>"NG", "result"=>$result);
print json_encode($result);
exit;
}
function responseOK($result) {
$result = array("status"=>"OK", "result"=>$result);
print json_encode($result);
exit;
}
?>
\ No newline at end of file
src/user/if/ajax_circle_new1.php 0 → 100644
<?php
// 圈子创建第一步
require_once ("../user_include.inc");
ErrorLogger::doOutput("Compass...ajax_circle_new1.php....Start.", 0);
//获取参数
$unionId = ParamUtil::getRequestString("unionId");
$title = ParamUtil::getRequestString("title");//圈子名称
$needCheck = ParamUtil::getRequestBoolean("needCheck", false);//圈子名称
$longitude = ParamUtil::getRequestString("longitude");//用户位置的经度
$latitude = ParamUtil::getRequestString("latitude");//用户位置的纬度
$result = array();
//参数检查
if(empty($unionId) || empty($title) || empty($longitude) || empty($latitude)) {
$result["message"] = "参数错误！";
responseNG($result);
}
//判断用户是否存在
$param = array();
$param['unionid'] = $unionId;
$param['delete_flg'] = false;
$userList = UserMst::getList($param,'id','desc', 0, 1);
if(empty($userList)) {
$result["message"] = "用户不存在！";
responseNG($result);
}
$userMst = $userList[0];
//是否已经有圈子
$param = array();
$param['owner_id'] = $userMst->id;
$param['delete_flg'] = false;
$circleCount = CircleDat::getListCount($param);
if($circleCount > 0) {
$result["message"] = "只能创建一个圈子！";
responseNG($result);
}
//调用腾讯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) {
//保存到用户当前地理位置中
$province = $resultObj->address_component->province;
$city = $resultObj->address_component->city;
$district = $resultObj->address_component->district;
}
//建立圈子
$circleDat = new CircleDat();
$circleDat->title = $title;
$circleDat->need_check = $needCheck;
$circleDat->member_count = 1;
$circleDat->longitude = $longitude;
$circleDat->latitude = $latitude;
$circleDat->province = $province;
$circleDat->city = $city;
$circleDat->district = $district;
$circleDat->owner_id = $userMst->id;
$circleDat->save();
//返回创建的圈子
$param = array();
$param['owner_id'] = $userMst->id;
$param['delete_flg'] = false;
$circleList = CircleDat::getList($param, "id", "desc", 0, 1);
if(!empty($circleList)) {
$circleDat = $circleList[0];
//同步插入圈子成员表
$circleMemberDat = new CircleMemberDat();
$circleMemberDat->circle_id = $circleDat->id;
$circleMemberDat->user_id = $userMst->id;
$circleMemberDat->name = $userMst->name;
$circleMemberDat->save();
//返回数据
$result["message"] = "创建成功！";
$result["circleDat"] = $circleDat;
responseOK($result);
}
$result["message"] = "系统错误！";
responseNG($result);
ErrorLogger::doOutput("Compass...ajax_circle_new1.php....End.", 0);
//返回结果
responseOK($result);
function responseNG($result) {
$result = array("status"=>"NG", "result"=>$result);
print json_encode($result);
exit;
}
function responseOK($result) {
$result = array("status"=>"OK", "result"=>$result);
print json_encode($result);
exit;
}
?>
\ No newline at end of file
src/user/if/ajax_circle_new2.php 0 → 100644
<?
// 圈子创建第2步，提交介绍和封面图片
require_once ("../user_include.inc");
ErrorLogger::doOutput("Compass...ajax_circle_new2.php....Start.", 0);
//获取参数
$unionId = ParamUtil::getRequestString("unionId");
$circleId = ParamUtil::getRequestNumber("circleId", 0);
$comment = ParamUtil::getRequestString("comment");
//参数验证
if(empty($unionId) || empty($circleId) || empty($comment)) {
$result["message"] = "参数错误！";
responseNG($result);
}
//判断用户是否已经存在
$param = array();
$param['openid'] = $openId;
$param['unionid'] = $unionId;
$param['delete_flg'] = false;
$userList = UserMst::getList($param,'id','desc', 0, 1);
if(!empty($userList)) {
$result["message"] = "用户不存在！";
responseOK($result);
}
$userMst = $userList[0];
//圈子是否存在
$param = array();
$param['id'] = $circleId;
$param['owner_id'] = $userMst->id;
$param['delete_flg'] = false;
$circleDatList = CircleDat::getList($param,'id','desc', 0, 1);
if(empty($circleDatList)) {
$result["message"] = "数据错误！";
responseOK($result);
}
$circleDat = $circleDatList[0];
//处理上传图片
$aliHandler = new AliUploadHandler();
if(!empty($_FILES['frontImage']['tmp_name'])){
$upload_file = FileUploadUtil::getScalarFile(@$_FILES['frontImage']);
$tmp_file_name = date("Ymd") . "_" . trim(basename($upload_file->name));//保存的名字自定义，这里如果图片的名字原来的是aa.jp，保存成20200220_aa.jpg
$url = $aliHandler->uploadImg($tmp_file_name, $upload_file->tmp_name);
//这里的url就是http://compass-dev.oss-cn-beijing.aliyuncs.com/20200220_aa.jpg
$circleDat->front_image = $url;
}
$circleDat->comment = $comment;
$circleDat->save();
ErrorLogger::doOutput("Compass...ajax_circle_new2.php....End.", 0);
$result["message"] = "提交成功！";
responseOK($result);
function responseNG($result) {
$result = array("status"=>"NG", "result"=>$result);
print json_encode($result);
exit;
}
function responseOK($result) {
$result = array("status"=>"OK", "result"=>$result);
print json_encode($result);
exit;
}
?>
\ No newline at end of file
src/user/if/ajax_get_volunteer_event_detail.php
......@@ -71,12 +71,37 @@ if(date("Y-m-d H:i:s") <= $volunteerDat->finish_time) {
$personalMemberList = array();
$circleMemberList = array();
$param = array();
//【个人】
$param = array();
$param['volunteer_event_id'] = $userMst->id;
$param['circle_id'] = 0;
$param['delete_flg'] = false;
$tmpMemberList1 = VolunteerEventMemberDat::getList($param, "id", "desc");
if(!empty($tmpMemberList1)) {
foreach($tmpMemberList1 as $tmpMember) {
$tmpUser = UserMst::getById($tmpMember->user_id);
$tmpArray= array("name"=>$tmpUser->name);
$personalMemberList[] = $tmpArray;
}
}
//【圈子】
$param = array();
$param['volunteer_event_id'] = $userMst->id;
$param['circle_id_MIN'] = 1;
$param['is_owner'] = true;
$param['delete_flg'] = false;
$tmpMemberList = VolunteerEventMemberDat::getList($param, "id", "desc");
if(!empty($tmpMemberList)) {
foreach($tmpMemberList as $tmpMember) {
$tmpMemberList2 = VolunteerEventMemberDat::getList($param, "id", "desc");
if(!empty($tmpMemberList2)) {
foreach($tmpMemberList2 as $tmpMember) {
$tmpUser = UserMst::getById($tmpMember->user_id);
$param2 = array();
$param2['volunteer_event_id'] = $userMst->id;
$param2['circle_id'] = $tmpMember->circle_id;
$param2['delete_flg'] = false;
$tmpMemberCount = VolunteerEventMemberDat::getListCount($param2);
$tmpArray= array("name"=>$tmpUser->name, "enrollCount"=>$tmpMemberCount);
$circleMemberList[] = $tmpArray;
}
}
......@@ -87,6 +112,8 @@ $result["isComplete"] = $isComplete;
$result["isCircleOwner"] = $isCircleOwner;
$result["isMember"] = $isMember;
$result["volunteerEventDat"] = $volunteerDat;
$result["personalMemberList"] = $personalMemberList;
$result["circleMemberList"] = $circleMemberList;
ErrorLogger::doOutput("Compass...ajax_get_volunteer_event_detail.php....End.", 0);
......
src/user/if/ajax_set_volunteer_event_result.php 0 → 100644
<?php
// 上传志愿者活动凭证
require_once ("../user_include.inc");
ErrorLogger::doOutput("Compass...ajax_cancel_volunteer_event_personal.php....Start.", 0);
//获取参数
$unionId = ParamUtil::getRequestString("unionId");
$eventId = ParamUtil::getRequestNumber("eventId", 0);
$result = array();
//参数检查
if(empty($unionId)) {
$result["message"] = "参数错误！";
responseNG($result);
}
//判断用户是否存在
$param = array();
$param['unionid'] = $unionId;
$param['delete_flg'] = false;
$userList = UserMst::getList($param,'id','desc', 0, 1);
if(empty($userList)) {
$result["message"] = "用户不存在！";
responseNG($result);
}
//查询志愿者活动
$volunteerDat = VolunteerEventDat::getById($eventId);
if(empty($volunteerDat)) {
$result["message"] = "参数错误！";
responseNG($result);
}
$userMst = $userList[0];
//是否已经报名参加
$param = array();
$param['volunteer_event_id'] = $eventId;
$param['user_id'] = $userMst->id;
$param['delete_flg'] = false;
$tmpVolunteerEventMemberList = VolunteerEventMemberDat::getList($param, "id", "desc", 0, 1);
if(empty($tmpVolunteerEventMemberList)) {
$result["message"] = "数据错误！";
responseNG($result);
}
$volunteerEventMemberDat = $tmpVolunteerEventMemberList[0];
//个人报名直接取消
if($volunteerEventMemberDat->circle_id == 0) {
$volunteerEventMemberDat->delete_flg = true;
$volunteerEventMemberDat->save();
} else {
//圈子报名
if($volunteerEventMemberDat->is_owner) {
//圈主取消的情况下，取消所有成员报名
$circleId = $volunteerEventMemberDat->circle_id;
$sql = "update volunteer_event_member_dat set delete_flg=true where delete_flg=false and volunteer_event_id='{$eventId}' and circle_id='{$circleId}'";
$db = &CompassDBManager::getInstance();
$db->executeQuery($from.$sql_where);
} else {
//成员取消参加，之取消自己的的参加
$volunteerEventMemberDat->delete_flg = true;
$volunteerEventMemberDat->save();
}
}
ErrorLogger::doOutput("Compass...ajax_cancel_volunteer_event_personal.php....End.", 0);
//返回结果
$result["message"] = "取消成功！";
responseOK($result);
function responseNG($result) {
$result = array("status"=>"NG", "result"=>$result);
print json_encode($result);
exit;
}
function responseOK($result) {
$result = array("status"=>"OK", "result"=>$result);
print json_encode($result);
exit;
}
?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment