|
@@ -104,47 +104,47 @@ class OrderController extends Controller {
|
104
|
104
|
{
|
105
|
105
|
$admin_id = (int)$request->input('admin_id');
|
106
|
106
|
if(empty($admin_id)){
|
107
|
|
- return self::returnValue(['msg'=>'登录过期'], 2001);
|
|
107
|
+ return self::returnValue(['msg'=>'登录过期'], 2000);
|
108
|
108
|
}
|
109
|
109
|
$phone = $request->input('receiverMobile');
|
110
|
110
|
if(!preg_match('/^1\d{10}$/', $phone)){
|
111
|
|
- return self::returnValue(['msg'=>'手机号格式有误'], 2001);
|
|
111
|
+ return self::returnValue(['msg'=>'手机号格式有误'], 2000);
|
112
|
112
|
}
|
113
|
113
|
$customerName = $request->input('customerName');
|
114
|
114
|
if(empty($customerName)){
|
115
|
|
- return self::returnValue(['msg'=>'买家姓名不能为空'], 2001);
|
|
115
|
+ return self::returnValue(['msg'=>'买家姓名不能为空'], 2000);
|
116
|
116
|
}
|
117
|
117
|
$receiverName = $request->input('receiverName');
|
118
|
118
|
if(empty($receiverName)){
|
119
|
|
- return self::returnValue(['msg'=>'收货人姓名不能为空'], 2001);
|
|
119
|
+ return self::returnValue(['msg'=>'收货人姓名不能为空'], 2000);
|
120
|
120
|
}
|
121
|
121
|
$receiverState = $request->input('receiverState');
|
122
|
122
|
if(empty($receiverState)){
|
123
|
|
- return self::returnValue(['msg'=>'省份不能为空'], 2001);
|
|
123
|
+ return self::returnValue(['msg'=>'省份不能为空'], 2000);
|
124
|
124
|
}
|
125
|
125
|
$receiverCity = $request->input('receiverCity');
|
126
|
126
|
if(empty($receiverCity)){
|
127
|
|
- return self::returnValue(['msg'=>'市不能为空'], 2001);
|
|
127
|
+ return self::returnValue(['msg'=>'市不能为空'], 2000);
|
128
|
128
|
}
|
129
|
129
|
$receiverAddress = $request->input('receiverAddress');
|
130
|
130
|
if(empty($receiverAddress)){
|
131
|
|
- return self::returnValue(['msg'=>'详细地址不能为空'], 2001);
|
|
131
|
+ return self::returnValue(['msg'=>'详细地址不能为空'], 2000);
|
132
|
132
|
}
|
133
|
133
|
$delivery_date = $request->input('delivery_date');
|
134
|
134
|
if(empty($delivery_date)){
|
135
|
|
- return self::returnValue(['msg'=>'预发货时间不能为空'], 2001);
|
|
135
|
+ return self::returnValue(['msg'=>'预发货时间不能为空'], 2000);
|
136
|
136
|
}
|
137
|
137
|
$receivedAmount = $request->input('receivedAmount');
|
138
|
138
|
if(empty($receivedAmount)){
|
139
|
|
- return self::returnValue(['msg'=>'实付金额不能为空'], 2001);
|
|
139
|
+ return self::returnValue(['msg'=>'实付金额不能为空'], 2000);
|
140
|
140
|
}
|
141
|
141
|
$skus = $request->input('skus');
|
142
|
142
|
if(empty($skus)){
|
143
|
|
- return self::returnValue(['msg'=>'必须添加商品'], 2001);
|
|
143
|
+ return self::returnValue(['msg'=>'必须添加商品'], 2000);
|
144
|
144
|
}
|
145
|
145
|
$payment_type = (int)$request->input('payment_type');
|
146
|
146
|
if(empty($payment_type)){
|
147
|
|
- return self::returnValue(['msg'=>'必选支付方式'], 2001);
|
|
147
|
+ return self::returnValue(['msg'=>'必选支付方式'], 2000);
|
148
|
148
|
}
|
149
|
149
|
|
150
|
150
|
/*
|
|
@@ -152,7 +152,7 @@ class OrderController extends Controller {
|
152
|
152
|
$res = RedisModel::setnx($redisKey, 1);
|
153
|
153
|
if( $res == 0 ){
|
154
|
154
|
$msg = '操作过于频繁,请一分钟后继续操作';
|
155
|
|
- return self::returnValue(['msg'=>$msg], 2001);
|
|
155
|
+ return self::returnValue(['msg'=>$msg], 2000);
|
156
|
156
|
}
|
157
|
157
|
$res = RedisModel::expire( $redisKey, 60 );
|
158
|
158
|
*/
|
|
@@ -329,7 +329,7 @@ class OrderController extends Controller {
|
329
|
329
|
public function getAddress(Request $request){
|
330
|
330
|
$phone = $request->input('phone');
|
331
|
331
|
if(!preg_match('/^1\d{10}$/', $phone)){
|
332
|
|
- return self::returnValue([],2001);
|
|
332
|
+ return self::returnValue([],2000);
|
333
|
333
|
}
|
334
|
334
|
|
335
|
335
|
$result = DB::table('customers')->select('receiverState', 'receiverCity', 'receiverAddress', 'fanTime')->where('phone', $phone)->first();
|
|
@@ -341,7 +341,7 @@ class OrderController extends Controller {
|
341
|
341
|
public function getBalance(Request $request){
|
342
|
342
|
$phone = $request->input('phone');
|
343
|
343
|
if(!preg_match('/^1\d{10}$/', $phone)){
|
344
|
|
- return self::returnValue([],2001);
|
|
344
|
+ return self::returnValue([],2000);
|
345
|
345
|
}
|
346
|
346
|
$result = CustomerInfo::where('phone', $phone)->pluck('balance');
|
347
|
347
|
if(empty($result)) $result = 0;
|
|
@@ -357,51 +357,51 @@ class OrderController extends Controller {
|
357
|
357
|
{
|
358
|
358
|
$admin_id = (int)$request->input('admin_id');
|
359
|
359
|
if(empty($admin_id)){
|
360
|
|
- return self::returnValue(['msg'=>'登录过期'], 2001);
|
|
360
|
+ return self::returnValue(['msg'=>'登录过期'], 2000);
|
361
|
361
|
}
|
362
|
362
|
$id = (int)$request->input('id');
|
363
|
363
|
if(empty($id)){
|
364
|
|
- return self::returnValue(['msg'=>'订单id有误'], 2001);
|
|
364
|
+ return self::returnValue(['msg'=>'订单id有误'], 2000);
|
365
|
365
|
}
|
366
|
366
|
$phone = $request->input('receiverMobile');
|
367
|
367
|
if(!preg_match('/^1\d{10}$/', $phone)){
|
368
|
|
- return self::returnValue(['msg'=>'手机号格式有误'], 2001);
|
|
368
|
+ return self::returnValue(['msg'=>'手机号格式有误'], 2000);
|
369
|
369
|
}
|
370
|
370
|
$customerName = $request->input('customerName');
|
371
|
371
|
if(empty($customerName)){
|
372
|
|
- return self::returnValue(['msg'=>'买家姓名不能为空'], 2001);
|
|
372
|
+ return self::returnValue(['msg'=>'买家姓名不能为空'], 2000);
|
373
|
373
|
}
|
374
|
374
|
$receiverName = $request->input('receiverName');
|
375
|
375
|
if(empty($receiverName)){
|
376
|
|
- return self::returnValue(['msg'=>'收货人姓名不能为空'], 2001);
|
|
376
|
+ return self::returnValue(['msg'=>'收货人姓名不能为空'], 2000);
|
377
|
377
|
}
|
378
|
378
|
$receiverState = $request->input('receiverState');
|
379
|
379
|
if(empty($receiverState)){
|
380
|
|
- return self::returnValue(['msg'=>'省份不能为空'], 2001);
|
|
380
|
+ return self::returnValue(['msg'=>'省份不能为空'], 2000);
|
381
|
381
|
}
|
382
|
382
|
$receiverCity = $request->input('receiverCity');
|
383
|
383
|
if(empty($receiverCity)){
|
384
|
|
- return self::returnValue(['msg'=>'市不能为空'], 2001);
|
|
384
|
+ return self::returnValue(['msg'=>'市不能为空'], 2000);
|
385
|
385
|
}
|
386
|
386
|
$receiverAddress = $request->input('receiverAddress');
|
387
|
387
|
if(empty($receiverAddress)){
|
388
|
|
- return self::returnValue(['msg'=>'详细地址不能为空'], 2001);
|
|
388
|
+ return self::returnValue(['msg'=>'详细地址不能为空'], 2000);
|
389
|
389
|
}
|
390
|
390
|
$delivery_date = $request->input('delivery_date');
|
391
|
391
|
if(empty($delivery_date)){
|
392
|
|
- return self::returnValue(['msg'=>'预发货时间不能为空'], 2001);
|
|
392
|
+ return self::returnValue(['msg'=>'预发货时间不能为空'], 2000);
|
393
|
393
|
}
|
394
|
394
|
$receivedAmount = $request->input('receivedAmount');
|
395
|
395
|
if(empty($receivedAmount)){
|
396
|
|
- return self::returnValue(['msg'=>'实付金额不能为空'], 2001);
|
|
396
|
+ return self::returnValue(['msg'=>'实付金额不能为空'], 2000);
|
397
|
397
|
}
|
398
|
398
|
$skus = $request->input('skus');
|
399
|
399
|
if(empty($skus)){
|
400
|
|
- return self::returnValue(['msg'=>'必须添加商品'], 2001);
|
|
400
|
+ return self::returnValue(['msg'=>'必须添加商品'], 2000);
|
401
|
401
|
}
|
402
|
402
|
$payment_type = (int)$request->input('payment_type');
|
403
|
403
|
if(empty($payment_type)){
|
404
|
|
- return self::returnValue(['msg'=>'必选支付方式'], 2001);
|
|
404
|
+ return self::returnValue(['msg'=>'必选支付方式'], 2000);
|
405
|
405
|
}
|
406
|
406
|
|
407
|
407
|
//更新数据
|
|
@@ -437,14 +437,14 @@ class OrderController extends Controller {
|
437
|
437
|
$balance = isset($customerInfo->balance) ? $customerInfo->balance : 0 ;
|
438
|
438
|
if($balance < $order['receivedAmount']){
|
439
|
439
|
//余额不足
|
440
|
|
- return self::returnValue(['msg'=>'充值卡余额不足'], 2001);
|
|
440
|
+ return self::returnValue(['msg'=>'充值卡余额不足'], 2000);
|
441
|
441
|
}
|
442
|
442
|
}elseif($old_order->receivedAmount != $order['receivedAmount']){
|
443
|
443
|
$customerInfo = CustomerInfo::where('phone', $deposit_phone)->first();
|
444
|
444
|
$balance = $customerInfo->balance;
|
445
|
445
|
if( $balance < $order['receivedAmount']-$old_order->receivedAmount ){
|
446
|
446
|
//余额不足
|
447
|
|
- return self::returnValue(['msg'=>'充值卡余额不足'], 2001);
|
|
447
|
+ return self::returnValue(['msg'=>'充值卡余额不足'], 2000);
|
448
|
448
|
}
|
449
|
449
|
}
|
450
|
450
|
}
|
|
@@ -506,7 +506,7 @@ class OrderController extends Controller {
|
506
|
506
|
}catch (Exception $e){
|
507
|
507
|
DB::rollback();
|
508
|
508
|
Log::errorLog($request,['error'=>$e->getMessage()],"order/update",0,'');
|
509
|
|
- return self::returnValue(['msg'=>$e->getMessage()], 2001);
|
|
509
|
+ return self::returnValue(['msg'=>$e->getMessage()], 2000);
|
510
|
510
|
}
|
511
|
511
|
|
512
|
512
|
return self::returnValue(['msg' => '更新成功']);
|
|
@@ -535,10 +535,10 @@ class OrderController extends Controller {
|
535
|
535
|
if( !empty($enableStatus) ){
|
536
|
536
|
$statusArr = array_column($enableStatus, 'status');
|
537
|
537
|
if( !in_array($order->status, $statusArr) ){
|
538
|
|
- return self::returnValue(['msg'=>'异常操作'], 2001);
|
|
538
|
+ return self::returnValue(['msg'=>'异常操作'], 2000);
|
539
|
539
|
}
|
540
|
540
|
}else{
|
541
|
|
- return self::returnValue(['msg'=>'异常操作'], 2001);
|
|
541
|
+ return self::returnValue(['msg'=>'异常操作'], 2000);
|
542
|
542
|
}
|
543
|
543
|
|
544
|
544
|
DB::beginTransaction();
|
|
@@ -575,7 +575,7 @@ class OrderController extends Controller {
|
575
|
575
|
}catch (Exception $e){
|
576
|
576
|
Log::errorLog($request,['error'=>$e->getMessage()],"order/setverify",0,['id'=>$id]);
|
577
|
577
|
DB::rollback();
|
578
|
|
- return self::returnValue(['msg'=>$e->getMessage()], 2001);
|
|
578
|
+ return self::returnValue(['msg'=>$e->getMessage()], 2000);
|
579
|
579
|
}
|
580
|
580
|
|
581
|
581
|
return self::returnValue(['msg'=>'操作成功']);
|