gitfjn/duolamaojiazhen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加个人中心功能

Browse Source 
添加订单记录
This commit is contained in:
gitfjn
2026-01-14 18:05:59 +08:00
parent e658c2a0fd
commit dfec5819aa
8 changed files with 249 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
application/api/logic/OrderLogic.php
View File

@@ -957,29 +957,70 @@ class OrderLogic extends LogicBase
case 'pay':
$where[] = ['pay_status', '=', CommonOrder::STATUS_WAIT_PAY];
break;
case 'stop':
$where[] = ['pay_status', '=', 1];
$where[] = ['status', '=', 1];
break;
case 'delivery':
$where[] = ['pay_status', '=', 0];
$where[] = ['pay_status', '=', 1];
break;
case 'finish':
$where[] = ['order_status', '=',1];
$where[] = ['pay_status', '=', 1];
$where[] = ['order_status', '=', 3];
break;
case 'close':
$where[] = ['order_status', '=', 4];
break;
}
$user=Db::name('user')->where('id',$user_id)->find();
$count = $order->where(['del' => 0, 'user_id' => $user['mobile']])
->where($where)
->count();
// $user=Db::name('user')->where('id',$user_id)->find();
if ($type=='reserving'){
$where[] = ['pay_status', '=', 1];
//查询待预约订单
$count = $order->where(['del' => 0, 'user_id' => $user_id])
->with('OrderExe')
->where($where)
->count();
$lists = $order->where(['del' => 0, 'mobile' => $user['mobile']])
->where($where)
// ->with(['orderGoods'])
->field('id,order_sn,order_status,pay_status,order_amount,order_status,order_type,shipping_status,create_time,number,goods_id,code')
->page($page, $size)
->order('id desc')
->select();
$lists = $order->where(['del' => 0, 'user_id' => $user_id])
->where($where)
->with('OrderExe')
->field('id,order_sn,order_status,pay_status,order_amount,order_status,order_type,shipping_status,refund_status,create_time,number,goods_id,code')
->page($page, $size)
->order('id desc')
->select();
}else if($type == 'inservice'){
//服务中
$where[] = ['pay_status', '=', 1];
$count = $order->where(['del' => 0, 'user_id' => $user_id])
->with(['OrderExe' => function ($query) {
$query->where('timeout', '<>', 'null');
}])
->where($where)
->count();
$lists = $order->where(['del' => 0, 'user_id' => $user_id])
->where($where)
->with(['OrderExe' => function ($query) {
$query->where('timeout', '<>', 'null');
}])
->field('id,order_sn,order_status,pay_status,order_amount,order_status,order_type,shipping_status,refund_status,create_time,number,goods_id,code')
->page($page, $size)
->order('id desc')
->select();
}else{
$count = $order->where(['del' => 0, 'user_id' => $user_id])
->where($where)
->count();
$lists = $order->where(['del' => 0, 'user_id' => $user_id])
->where($where)
// ->with(['orderGoods'])
->field('id,order_sn,order_status,pay_status,order_amount,order_status,order_type,shipping_status,refund_status,create_time,number,goods_id,code')
->page($page, $size)
->order('id desc')
->select();
}
foreach ($lists as $list){
$goods=Db::name('goods')->where('id',$list['goods_id'])->find();
$list['image']=UrlServer::getFileUrl($goods['image']);
@@ -1329,17 +1370,18 @@ class OrderLogic extends LogicBase
$order = new Orderexe();
$where[] = ['order_sn', '=',$order_sn];
switch ($type) {
case 'pay':
case 'wait':
//待服务
$where[] = ['staff_status', '=',0];
break;
case 'delivery':
$where[] = ['staff_status', '=',1];
break;
case 'finish':
case 'service':
$where[] = ['staff_status', '=',2];
break;
case 'close':
$where[] = ['staff_status', '=',4];
case 'finish':
$where[] = ['staff_status', '=',3];
break;
}
@@ -1372,7 +1414,6 @@ class OrderLogic extends LogicBase
}
$data = [
'list' => $lists,
'page' => $page,