|
|
|
@ -18,11 +18,11 @@ class ImsCjdcOrderMain extends EloquentRepository |
|
|
|
public function get(Grid\Model $model) |
|
|
|
{ |
|
|
|
$builder = new \App\Models\ImsCjdcOrderMain(); |
|
|
|
$builder = $builder::leftJoin('ims_cjdc_user as u','u.id','ims_cjdc_order_main.user_id') |
|
|
|
$builder = $builder::leftJoin('ims_cjdc_user as u','u.id','lanzu_order_main.user_id') |
|
|
|
->with('market') |
|
|
|
->select('ims_cjdc_order_main.*','u.name as user_name') |
|
|
|
->select('lanzu_order_main.*','u.name as user_name') |
|
|
|
->where('type',1) |
|
|
|
->orderBy('ims_cjdc_order_main.id','desc');//只取线上订单数据
|
|
|
|
->orderBy('lanzu_order_main.id','desc');//只取线上订单数据
|
|
|
|
|
|
|
|
$this->setSort($model); |
|
|
|
$this->setPaginate($model); |
|
|
|
@ -40,7 +40,7 @@ class ImsCjdcOrderMain extends EloquentRepository |
|
|
|
$query = $query->toArray(); |
|
|
|
//如果订单状态为配送中 将state设置为31
|
|
|
|
foreach ($query['data'] as &$value){ |
|
|
|
if ($value['state']==3&&$value['order_shipping_code']==1){ |
|
|
|
if ($value['state']==3&&$value['shipping_type']==1){ |
|
|
|
$value['state'] = 31; |
|
|
|
} |
|
|
|
} |
|
|
|
|