|
|
@ -20,7 +20,7 @@ class OrderListService implements OrderListServiceInterface |
|
|
->join('ims_cjdc_order_main as m','o.order_main_id','=','m.id') |
|
|
->join('ims_cjdc_order_main as m','o.order_main_id','=','m.id') |
|
|
->join('ims_cjdc_storeset as s','s.store_id','=','o.store_id') |
|
|
->join('ims_cjdc_storeset as s','s.store_id','=','o.store_id') |
|
|
->where([ |
|
|
->where([ |
|
|
['o.store_id','=',$data['id']], |
|
|
|
|
|
|
|
|
['o.store_id','=',$data['store_id']], |
|
|
['o.type','=',1], |
|
|
['o.type','=',1], |
|
|
]) |
|
|
]) |
|
|
->whereIn('o.state',[$data['state']]) |
|
|
->whereIn('o.state',[$data['state']]) |
|
|
@ -74,7 +74,7 @@ class OrderListService implements OrderListServiceInterface |
|
|
{ |
|
|
{ |
|
|
$order_main = Db::table('ims_cjdc_order_main') |
|
|
$order_main = Db::table('ims_cjdc_order_main') |
|
|
->where([ |
|
|
->where([ |
|
|
['id','=',$data['id']], |
|
|
|
|
|
|
|
|
['id','=',$data['order_id']], |
|
|
['type','=',1], |
|
|
['type','=',1], |
|
|
]) |
|
|
]) |
|
|
->select( |
|
|
->select( |
|
|
@ -100,7 +100,7 @@ class OrderListService implements OrderListServiceInterface |
|
|
->first(); |
|
|
->first(); |
|
|
$order = Db::table('ims_cjdc_order as o') |
|
|
$order = Db::table('ims_cjdc_order as o') |
|
|
->join('ims_cjdc_store as s','o.store_id','=','s.id') |
|
|
->join('ims_cjdc_store as s','o.store_id','=','s.id') |
|
|
->where('o.order_main_id',$data['id']) |
|
|
|
|
|
|
|
|
->where('o.order_main_id',$data['order_id']) |
|
|
->select( |
|
|
->select( |
|
|
'o.id', |
|
|
'o.id', |
|
|
'o.store_id', |
|
|
'o.store_id', |
|
|
|
