Skip to content

Commit

Permalink
展示司机联系方式,更改数driver据库表
Browse files Browse the repository at this point in the history
  • Loading branch information
ibwei committed Apr 23, 2019
1 parent 4eda40e commit 2c51d8b
Show file tree
Hide file tree
Showing 21 changed files with 3,657 additions and 840 deletions.
Binary file added .phpintel/5d886431222f8b7d35c9ef2030d645b0
View file
Binary file not shown.
Binary file modified .phpintel/5e03f7c9e70495005b5e5fa93955443e
View file
Binary file not shown.
Binary file added .phpintel/7732ff8d40e49028c2c6e1bb21472641
View file
Binary file not shown.
Binary file added .phpintel/c47b8161ff52edb2ddb44f71bac3de2b
View file
Binary file not shown.
Binary file modified .phpintel/index
View file
Binary file not shown.
280 changes: 7 additions & 273 deletions app/Http/Controllers/Api/BusController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ public function searchBus1(Request $request)
->where([
['sites.name', '=', $start_site],
['schools.id', '=', $school_id],
['end_site', 'like', $end_site],
['start_time', '>=', $start_time],
['end_time', '<=', $end_time]
['end_site', 'like', $end_site]
// ['start_time', '>=', $start_time],
// ['end_time', '<=', $end_time]
])
->orderBy('start_time')
->limit($limit)
Expand Down Expand Up @@ -163,7 +163,6 @@ public function searchBus2(Request $request)
->limit($limit)
->get();
return $this->returnBusList($busList, $limit);

}

public function searchBus3(Request $request)
Expand All @@ -183,7 +182,7 @@ public function searchBus3(Request $request)
->where([
['sites.name', '=', $start_site],
['schools.id', '=', $school_id]
// ['start_time', '>=', $start_time],
// ['start_time', '>=', $start_time],
//['end_time', '<=', $end_time]
])
->orderBy('start_time')
Expand Down Expand Up @@ -224,278 +223,13 @@ public function searchBus4(Request $request)
->join('sites', 'sites.id', '=', 'bus.site_id')
->select('bus.id AS id', 'driver_line', 'sites.name AS start_site', 'end_site', 'small_price', 'small_count', 'big_price', 'big_count', 'normall_count', 'normall_price', 'note', 'start_time', 'end_time')
->where([
['schools.id', '=', $school_id],
['start_time', '>=', $start_time],
['end_time', '<=', $end_time]
['schools.id', '=', $school_id]
// ['start_time', '>=', $start_time],
// ['end_time', '<=', $end_time]
])
->orderBy('start_time')
->limit($limit)
->get();
return $this->returnBusList($busList, $limit);

}
//获取用户的个人信息
// public function getUserInfo(Request $request)
// {
// $data = json_decode(request('data'));
// $id = $data->uid;
// $data = \App\User::select('avatar', 'nickname', 'point', 'level')->find($id);
// $role = ["白银", "黄金", "铂金", "钻石"];
// $data["identy"] = $role[$data["level"]];
// $data["groupnum"] = DB::table('group_menbers')->select('user_id')->where('user_id', $id)->count();
// return $data;
// }
//
// //获取用户的所在与参与的团
// public function getMyGroup(Request $request)
// {
// $para = json_decode(request('data'));
// $id = $para->uid;
// $groupList = DB::table('groups')
// ->join('goods', 'groups.goods_id', '=', 'goods.id')
// ->join('group_menbers', 'group_menbers.group_id', '=', 'groups.id')
// ->join('users', 'group_menbers.user_id', 'users.id')
// ->where('group_menbers.user_id', $id)
// ->select('goods.*', 'users.id', 'group_menbers.*', 'groups.*')
// ->get();
// $arr = [];
// foreach ($groupList as $eachGroup) {
// $eachGroup->cat_id = $eachGroup->class_id;
// $eachGroup->order_img = 'http://pintuan.com/uploads/' . $eachGroup->goods_logo;
// $eachGroup->goods_amount = $eachGroup->goods_price;
// $eachGroup->status = \App\Models\Groups::getStatus($eachGroup->status);
// $end = $eachGroup->group_end_time;
// $eachGroup->group_off_time = strtotime($end);
// $arr[] = $eachGroup;
// }
//
// $groups = json_encode($arr);
// return $groupList;
// }
//
//
// //获取用户的优惠券
// public function getMyCoupons()
// {
// $para = json_decode(request('data'));
// $id = $para->uid;
// $coupons = DB::table('coupons')
// ->join('user_coupons', 'coupon_id', '=', 'coupons.id')
// ->select('user_coupons.*', 'coupons.*')
// ->where([
// ['coupons.status', 1], //优惠卷还可用
// ['user_coupons.status', '<>', 2], //未消费
// ['user_coupons.count', '>', 0] //数量要大于0
// ])
// ->get();
// return $coupons;
//
// }
//
// //获取用户的收获地址
// public function getMyAddresses(User $user)
// {
// $para = json_decode(request('data'));
// $id = $para->uid;
// $addresses = DB::table('users')
// ->join('addresses', 'user_id', '=', 'users.id')
// ->select('addresses.*', 'addresses.id AS address_id')
// ->where('users.id', $id)->orderBy('selected', 'DESC')
// ->get();
// return $addresses;
//
// }
//
// //设置用户的默认地址
// public function setDefaultAddress()
// {
// $para = json_decode(request('data'));
// $uid = $para->uid;
// $ad_id = $para->address_id;
// $result = DB::table('addresses')->where('user_id', $uid)->update(['selected' => 0]);
// $result1 = DB::table('addresses')->where('id', $ad_id)->update(['selected' => 1]);
// if ($result && $result1) {
// return 1;
// } else {
// return 'setDefaultAddress Fail';
// }
// }
//
// //删除用户的收获地址
// public function delAddress()
// {
// $para = json_decode(request('data'));
// $uid = $para->uid;
// $address_id = $para->address_id;
// $result = DB::table('addresses')->where([
// ['id', $address_id],
// ['user_id', $uid]
// ])->delete();
// if ($result) {
// return 1;
// } else {
// return "Delete Fail";
// }
// }
//
// public function editAddress()
// {
// return "editAddress";
// }
//
// //编辑或者新增用户收获地址
// public function saveAddress(Request $request)
// {
// $para = json_decode(request('data'));
// $info = [
// 'user_id' => $para->uid,
// 'consignee' => $para->consignee,
// 'tel' => $para->tel,
// 'province' => $para->province,
// 'city' => $para->city,
// 'district' => $para->district,
// 'address' => $para->address,
// ];
//
// if ($para->address_id == '') {
// $result = DB::table('addresses')->where([
// ['selected', 1],
// ['user_id', $para->uid],
// ])->count();
// if (!$result) {
// $info['selected'] = 1;
// } else {
// $info['selected'] = 0;
// }
// $save = DB::table('addresses')->insert($info);
// if ($save) {
// return 'Save Ok';
// } else {
// return 'Save Failed';
// }
// } else {
// $edit = DB::table('addresses')->where([
// ['user_id', 1],
// ['id', $para->address_id],
// ])->update($info);
// if ($edit) {
// return 'Edit Ok';
// } else {
// return "Edit Failed!";
// }
// }
// }
// //获取用户的订单列表
// public function getOrderList(){
// $para = json_decode(request('data'));
// $uid=$para->uid;
// $type=$para->type;
// if($type==0){
// $type=[0];
// }elseif($type==1){
// $type=[1];
// }else{
// $type=[1,0];
// }
// $orders=DB::table('orders')
// ->join('goods','goods.id','=','orders.goods_id')
// ->join('addresses','addresses.id','=','orders.address_id')
// ->where('orders.user_id',$uid)
// ->whereIn('order_status',$type)
// ->get();
// foreach($orders as $order){
// $order->order_img="http://pintuan.com/uploads/".$order->goods_logo;
// $order->pay_status=$order->order_status;
// $order->order_sn=$order->order_id;
// $order->address=$order->province.$order->city.$order->district.$order->address;
// }
// return json_encode($orders);
//
// }
//
// //删除用户的某一订单
// public function delOrder(){
// $para = json_decode(request('data'));
// $order_id=$para->order_sn;
// $uid=$para->uid;
// $result=DB::table('orders')->where([
// ['user_id',$uid],
// ['order_id',$order_id]
// ])->delete();
// if($result){
// $a["status"]=200;
// return $a;
// }
// }
//
// //获取某用户某订单的具体信息
// public function getOrderInfo(){
// $para = json_decode(request('data'));
// $order_id=$para->order_id;
// $uid=$para->uid;
// $orders=DB::table('orders')
// ->join('goods','goods.id','=','orders.goods_id')
// ->join('addresses','addresses.id','=','orders.address_id')
// ->where([
// ['orders.user_id',$uid],
// ['orders.id',$order_id]
// ])->get();
// foreach($orders as $order){
// $order->order_img="http://pintuan.com/uploads/".$order->goods_logo;
// $order->pay_status=$order->order_status;
// $order->order_sn=$order->order_id;
// $order->address=$order->province.$order->city.$order->district.$order->address;
// $order->money_paid=$order->price*$order->group_num+$order->addr_price;
// $order->goods_amount=$order->price*$order->group_num;
// }
// return json_encode($orders);
//
//
// }
//
// //积分商品模块并未开发,推假数据
// public function getPointGoods()
// {
//
// $data = [
// 0 => [
// 'goods_level' => '3',
// 'info_img' => 'https://img14.360buyimg.com/n0/jfs/t17086/360/1163764245/333102/75336402/5abdf74fN6794d754.jpg',
// 'goods_name' => '零食大礼包一整箱组合装送女友生日 好吃的混装休闲进口零食 超大特产食品小吃送女生儿童团购 我的女神+娃娃',
// 'goods_sale_num' => '138',
// 'goods_num' => '200',
// 'goods_point' => '300'
//
// ],
// 1 => [
// 'goods_level' => '2',
// 'info_img' => 'https://img14.360buyimg.com/n0/jfs/t16813/364/1126794051/105586/1c8246e1/5abb6493N12404384.jpg',
// 'goods_name' => '广州酒家 金装手信礼盒424g/盒 广东特产利口福广式饼酥糕点下午茶点心 中华老字号手信',
// 'goods_sale_num' => '61',
// 'goods_num' => '999',
// 'goods_point' => '10'
//
// ],
// 2 => [
// 'goods_level' => '1',
// 'info_img' => 'https://img14.360buyimg.com/n0/jfs/t19063/253/945245218/468655/74e68d12/5ab35162N19f35fdd.jpg',
// 'goods_name' => '廷妃 零食大礼包组合送女友女生日一箱整箱超大吃货吃的混合装小吃进口 128元25种零食世界那么大礼盒',
// 'goods_sale_num' => '9999',
// 'goods_num' => '100',
// 'goods_point' => '300'
//
// ]
// ];
// return $data;
// }
//
// //获取分类 (测试)
// public
// function getCates()
// {
// $cate = new \App\Models\Cate;
// return $cate->getAllClasses()->toArray();
// }

}

22 changes: 10 additions & 12 deletions app/Http/Controllers/Api/LoginController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
use Validator;
use EasyWeChat\Factory;
use Ucpaas;
use function GuzzleHttp\json_encode;

class LoginController extends ApiController
{

Expand Down Expand Up @@ -50,8 +52,8 @@ public function easyWechatGetSession($code)
*/
public function login(Request $request)
{

// 获取openid
//return $request->userInfo['nickName'];
if ($request->code) {
$wx_info = $this->easyWechatGetSession($request->code);
}
Expand Down Expand Up @@ -84,20 +86,20 @@ public function register($request, $openid)
//进行基本验证
$newUser = [
'openid' => $openid, //openid
'nickname' => $request->userInfo['nickName'],// 昵称
'avatar' => $request->userInfo['avatarUrl'], //头像
'nickname' => $request->nickName, // 昵称
'avatar' => $request->avatarUrl, //头像
'unionid' => '', // unionid (可空)
'login_ip' => $this->getClientIP(),
'gender'=>$request->userInfo['gender'],
'point'=>0,
'description'=>'太懒了,什么也没写',
'gender' => $request->gender,
'point' => 0,
'description' => '太懒了,什么也没写',
'login_time' => Carbon::now()
];
$n_user = User::create($newUser);
$uid = $n_user->id;
// 直接创建token
$token = $n_user->createToken($openid)->accessToken;
$isDriver=false;
$isDriver = false;
return $this->success(compact('token', 'uid'));
}
//返回登录状态
Expand All @@ -119,7 +121,6 @@ public function getMobile(Request $request)

if ($a1->mobile) {
return $para1->unionId;

}
return 0;
}
Expand All @@ -139,7 +140,7 @@ public function saveMobile(Request $request)
$result = DB::table('users')
->where('id', $id)
->update(['mobile' => $mobile]);
if ($result) {
if ($result) {
$data1 = ["status" => 1, "msg" => "已绑定", "uid" => $id];
Cache::forget('code');
return json_encode($data1);
Expand Down Expand Up @@ -196,6 +197,3 @@ function GetRandStr($len)
return $output;
}
}



Loading

0 comments on commit 2c51d8b

Please sign in to comment.