c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into bootstrap

Browse Source
This commit is contained in:
LI JIAHAO
2017-06-14 17:51:21 +08:00
parent 7950e5a3db d766cff45c
commit 0a9d472ebf
28 changed files with 456 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AuthController.php
+1
View File
@@ -42,6 +42,7 @@ class AuthController extends Controller
$user->havecheckedemail = false;
$user->role = 0;
$user->baned = false;
$user->realname = phpCAS::getAttribute('name');
$user->save();
// log start
app/Http/Controllers/GoodController.php
+7 -3
View File
@@ -346,7 +346,10 @@ class GoodController extends Controller
$width = 1920;
if($height > 1080)
$height = 1080;
$file = Storage::get('good/titlepic/'.$good_id);
if (!Storage::exists('good/titlepic/'.$good_id))
$file = Storage::get('public/titlepic.jpg');
else
$file = Storage::get('good/titlepic/'.$good_id);
$image = Image::make($file)->resize($width, $height);
return $image->response('jpg');
}
@@ -358,13 +361,14 @@ class GoodController extends Controller
$good->update();
$admin_id = $request->session()->get('user_id');
MessageController::sendMessageHandle($admin_id, $good->user_id, "【系统消息】您好！您的商品（编号：".$good_id."）由于不符合有关规定已被管理员（ID：".$admin_id."）下架。请在此消息下询问具体细节。");
MessageController::sendMessageHandle($admin_id, $good->user_id, "【系统消息】您好！您的<a href='/good/" . $good_id ."'>商品（编号：".$good_id."）</a>由于不符合有关规定已被管理员（ID：".$admin_id."）下架。请在此消息下询问具体细节。");
$trans = Transaction::where('good_id', $good_id)->get();
foreach($trans as $tran)
{
$tran->status = 0;
MessageController::sendMessageHandle(0, $tran->buyer_id, "【系统消息】您好！由于该商品不符合有关规定被下架，您的订单（编号：".$tran->id."）已被取消。非常抱歉。");
MessageController::sendMessageHandle(0, $tran->buyer_id, "【系统消息】您好！由于该商品不符合有关规定被下架，您的<a href='/user/trans'>订单（编号：".$tran->id."）</a>已被取消。非常抱歉。");
$tran->update();
}
app/Http/Controllers/MessageController.php
+9
View File
@@ -156,4 +156,13 @@ class MessageController extends Controller
return Redirect::to('/message');
}
public function closeConversation(Request $request, $receiver)
{
$user_id = $request->session()->get('user_id');
MessageContact::where('user_id', $user_id)
->where('contact_id', $receiver)
->delete();
return json_encode(['result' => true, 'msg' => 'success']);
}
}
app/Http/Controllers/TransactionController.php
+25 -20
View File
@@ -12,6 +12,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Redirect;
use App\Ticket;
use App\UserInfo;
use Illuminate\Support\Facades\View;
class TransactionController extends Controller
{
@@ -93,11 +94,11 @@ class TransactionController extends Controller
private function buy($good_id, $buyer_id, $count, $request_ip)
{
if (GoodInfo::where('id', $good_id)->where('baned', false)->count() == 0)
return json_encode(['result' => false, 'msg' => 'No such item']);
return json_encode(['result' => false, 'msg' => '没有此商品']);
$good = GoodInfo::find($good_id);
$buyer = User::find($buyer_id);
if ($count > $good->count)
return json_encode(['result' => false, 'msg' => 'Out of stock']);
return json_encode(['result' => false, 'msg' => '商品缺货']);
$trans = new Transaction();
$trans->good_id = $good_id;
@@ -116,7 +117,7 @@ class TransactionController extends Controller
$message = new Message();
$message->sender_id = 0;
$message->receiver_id = $good->user_id;
$message->content = '您好！' . $buyer->not_null_nickname . '购买了你的' . $good->good_name . '，请及时前往确认。';
$message->content = '您好！<a href="/user/' . $buyer_id . '">' . $buyer->not_null_nickname . '</a>购买了你的<a href="/good/' . $good_id . '">' . $good->good_name . '</a>，请及时前往<a href="/user/sell/trans">交易订单页</a>确认。';
$message->save();
//Create or Update MessageContact
@@ -149,7 +150,7 @@ class TransactionController extends Controller
$message->sender_id = 0;
$good = $trans->good;
$message->receiver_id = $good->user_id;
$message->content = '您好！您的' . $good->good_name . '的一个订单被买家取消，你可以前往查看。';
$message->content = '您好！您的<a href="/good/' . $good->id . '">' . $good->good_name . '</a>的一个订单被买家取消，你可以前往<a href="/user/sell/trans">交易订单页</a>查看。';
$message->save();
//Create or Update MessageContact
$contact = MessageContact::firstOrNew([
@@ -177,7 +178,7 @@ class TransactionController extends Controller
$message->sender_id = 0;
$good = $trans->good;
$message->receiver_id = $trans->buyer_id;
$message->content = '您好！您购买的' . $good->good_name . '的一个订单被卖家驳回，你可以前往查看。';
$message->content = '您好！您购买的<a href="/good/' . $good->id . '">' . $good->good_name . '</a>的一个订单被卖家驳回，你可以前往<a href="/user/trans">交易订单页</a>查看。';
$message->save();
//Create or Update MessageContact
$contact = MessageContact::firstOrNew([
@@ -190,19 +191,21 @@ class TransactionController extends Controller
return json_encode(['result' => true, 'character' => 'seller', 'msg' => 'success']);
break;
default:
return json_encode(['result' => false, 'msg' => 'unauthorized']);
return json_encode(['result' => false, 'msg' => '未授权的访问']);
}
}
private function sell($trans, $user_id, $request_ip)
{
if ($trans->seller_id != $user_id)
return json_encode(['result' => false, 'msg' => 'unauthorized']);
return json_encode(['result' => false, 'msg' => '未授权的访问']);
if($trans->status != 1)
return json_encode(['result' => false, 'msg' => 'invalid']);
return json_encode(['result' => false, 'msg' => '无效的请求']);
$good = $trans->good;
if ($trans->count > $good->count)
return json_encode(['result' => false, 'msg' => 'Out of stock']);
if ($trans->number > $good->count)
return json_encode(['result' => false, 'msg' => '商品缺货']);
$good->count = $good->count - $trans->number;
$good->save();
$trans->status = 2;
$trans->save();
@@ -216,7 +219,7 @@ class TransactionController extends Controller
$message = new Message();
$message->sender_id = 0;
$message->receiver_id = $trans->buyer_id;
$message->content = '您好！你订购的' . $good->good_name . '已被卖家确认，你们现在可以去看对方的联系方式并且交♂易啦。';
$message->content = '您好！你订购的<a href="/good/' . $good->id . '">' . $good->good_name . '</a>已被卖家确认，你们现在可以去<a href="/trans/' . $trans->id . '">查看对方的联系方式</a>并且交♂易啦。';
$message->save();
//Create or Update MessageContact
$contact = MessageContact::firstOrNew([
@@ -232,9 +235,9 @@ class TransactionController extends Controller
private function update($trans, $user_id, $number, $request_ip)
{
if ($trans->seller_id != $user_id)
return json_encode(['result' => false, 'msg' => 'unauthorized']);
return json_encode(['result' => false, 'msg' => '未授权的访问']);
if($trans->status != 2)
return json_encode(['result' => false, 'msg' => 'invalid']);
return json_encode(['result' => false, 'msg' => '无效的请求']);
$trans->number = $number;
$trans->save();
@@ -251,11 +254,11 @@ class TransactionController extends Controller
private function finish($trans, $user_id, $result, $request_ip)
{
if ($trans->seller_id != $user_id)
return json_encode(['result' => false, 'msg' => 'unauthorized']);
return json_encode(['result' => false, 'msg' => '未授权的访问']);
if($trans->status != 2)
return json_encode(['result' => false, 'msg' => 'invalid']);
if($result) {
$trans->good->count = $trans->good->count - $trans->number;
return json_encode(['result' => false, 'msg' => '无效的请求']);
if(!$result) {
$trans->good->count = $trans->good->count + $trans->number;
$trans->good->save();
}
if($result)
@@ -279,9 +282,9 @@ class TransactionController extends Controller
$message->receiver_id = $trans->buyer_id;
$good = $trans->good;
if($result)
$message->content = '您好！你订购的' . $good->good_name . '的订单已被卖家标记为交易成功，你现在可以去评价此单交易啦。';
$message->content = '您好！你订购的<a href="/good/' . $good->id . '">' . $good->good_name . '</a>的订单已被卖家标记为交易成功，你现在可以去<a href="/user/trans">评价此单交易</a>啦。';
else
$message->content = '您好！你订购的' . $good->good_name . '的订单已被卖家标记为交易失败。';
$message->content = '您好！你订购的<a href="/good/' . $good->id . '">' . $good->good_name . '</a>的订单已被卖家标记为交易失败。';
$message->save();
//Create or Update MessageContact
$contact = MessageContact::firstOrNew([
@@ -298,9 +301,11 @@ class TransactionController extends Controller
{
$user_id = $request->session()->get('user_id');
$trans = Transaction::find($trans_id);
if(!$trans)
return View::make('common.errorPage')->withErrors('交易ID错误！');
$seller = User::with('user_infos')->find($trans->seller_id);
$buyer = User::with('user_infos')->find($trans->buyer_id);
if(!$trans || ($user_id != $trans->buyer_id && $user_id != $trans->seller_id))
if(($user_id != $trans->buyer_id && $user_id != $trans->seller_id) || $trans->status != 2)
return View::make('common.errorPage')->withErrors('交易ID错误！');
$data['tran'] = $trans;
$data['seller'] = $seller;
app/Http/Controllers/UserController.php
+14 -5
View File
@@ -59,15 +59,19 @@ class UserController extends Controller
public function regUserInfo(Request $request)
{
$user_id = $request->session()->get('user_id');
$data = [];
$data['userinfos'] = UserInfo::where('user_id', $request->session()->get('user_id'))->get();
$data['user'] = User::where('id', $user_id)->first();
$data['userinfos'] = UserInfo::where('user_id', $user_id)->get();
return View::make('auth.register3')->with($data);
}
public function userInfo(Request $request)
{
$user_id = $request->session()->get('user_id');
$data = [];
$data['userinfos'] = UserInfo::where('user_id', $request->session()->get('user_id'))->get();
$data['user'] = User::where('id', $user_id)->first();
$data['userinfos'] = UserInfo::where('user_id', $user_id)->get();
return View::make('user.userInfo')->with($data);
}
@@ -82,7 +86,6 @@ class UserController extends Controller
$user_id = $request->session()->get('user_id');
$user_info = new UserInfo();
$user_info->user_id = $user_id;
$user_info->realname = $input['realname'];
if (isset($input['gender']))
$user_info->gender = $input['gender'];
if (isset($input['tel_num']))
@@ -116,7 +119,6 @@ class UserController extends Controller
$user_id = $request->session()->get('user_id');
$user_info = UserInfo::find($request->id);
if ($user_info->user_id != $user_id) return Redirect::to('/user/' . $user_id)->withErrors('无权限访问');
$user_info->realname = $input['realname'];
if (isset($input['gender'])) $user_info->gender = $input['gender'];
else $user_info->gender = '';
if (isset($input['tel_num'])) $user_info->tel_num = $input['tel_num'];
@@ -156,6 +158,13 @@ class UserController extends Controller
if(!$user)
return View::make('common.errorPage')->withErrors('用户ID错误！');
$data['user'] = $user;
$data['goods'] = GoodInfo::where('user_id', $user_id)->where('count', '>', 0)->where('baned', false)->paginate(15);
$page = isset($request->page) ? $request->page : 1;
$tickets = Ticket::where('receiver_id', $user_id)->where('type', 1)
->orWhere('receiver_id', $user_id)->where('type', 2)->where('state', 2)
->orderBy('id', 'desc')->get();
$data['tickets'] = $tickets;
return View::make('user.userProfile')->with($data);
}
@@ -268,7 +277,7 @@ class UserController extends Controller
{
$data = [];
$user_id = $request->session()->get('user_id');
$data['trans'] = Transaction::with('feedback')->where('buyer_id', $user_id)->orderBy('id', 'desc')->paginate(15);
$data['trans'] = Transaction::with('feedback', 'good')->where('buyer_id', $user_id)->orderBy('id', 'desc')->paginate(15);
return view::make('user.buyer')->with($data);
}
app/Http/Requests/StoreUserInfoRequest.php
-2
View File
@@ -25,14 +25,12 @@ class StoreUserInfoRequest extends Request
{
if($this->method()=='GET') return [];
return [
'realname'=>'required',
'tel_num'=>'required',
];
}
public function messages(){
return [
'realname.required' => '真实姓名不可为空！',
'tel_num.required' => '手机号不可为空！',
];
}
app/Http/routes.php
+1
View File
@@ -71,6 +71,7 @@ Route::group(['middleware' => ['web']],function () {
Route::get('/message/getHistoryMessage', "MessageController@getHistoryMessage");
Route::get('/message/getNewMessage', "MessageController@getNewMessage");
Route::get('/message/startConversation/{receiver}', "MessageController@startConversation");
Route::get('/message/closeConversation/{receiver}', "MessageController@closeConversation");
});
Route::get('/user/{user_id}/banpage', "UserController@banPage")->middleware('admin');