|
|
|
@ -99,6 +99,11 @@ class OrderListService implements OrderListServiceInterface |
|
|
|
'dada_status' |
|
|
|
) |
|
|
|
->first(); |
|
|
|
if($order_main->dada_status > 0){ |
|
|
|
$order_main->ps_mode = '达达配送'; |
|
|
|
}else{ |
|
|
|
$order_main->ps_mode = '服务站配送'; |
|
|
|
} |
|
|
|
$order = Db::table('ims_cjdc_order as o') |
|
|
|
->join('ims_cjdc_store as s','o.store_id','=','s.id') |
|
|
|
->where('o.order_main_id',$data['order_id']) |
|
|
|
@ -116,11 +121,6 @@ class OrderListService implements OrderListServiceInterface |
|
|
|
->get(); |
|
|
|
$store_list = array(); |
|
|
|
foreach ($order as $k => $v){ |
|
|
|
if($v->dada_status > 0){ |
|
|
|
$v->ps_mode = '达达配送'; |
|
|
|
}else{ |
|
|
|
$v->ps_mode = '服务站配送'; |
|
|
|
} |
|
|
|
$goods = Db::table('ims_cjdc_order_goods as og') |
|
|
|
->join('ims_cjdc_goods as g','g.id','=','og.good_id') |
|
|
|
->where('og.order_id',$v->id) |
|
|
|
|