|
@@ -589,6 +589,9 @@ class SalesOrderService extends Service
|
|
//订单状态数据组织
|
|
//订单状态数据组织
|
|
$state_array = $this->getStateMake($sales);
|
|
$state_array = $this->getStateMake($sales);
|
|
|
|
|
|
|
|
+ //分派的总社或分社
|
|
|
|
+ $dispatch = $this->getDispatchData($sales);
|
|
|
|
+
|
|
foreach ($sales as $key => $value){
|
|
foreach ($sales as $key => $value){
|
|
$sales[$key]['state_title'] = $this->makeState($value, $state_array);
|
|
$sales[$key]['state_title'] = $this->makeState($value, $state_array);
|
|
$sales[$key]['plat_type_title'] = $basic_map[$value['plat_type']] ?? '';
|
|
$sales[$key]['plat_type_title'] = $basic_map[$value['plat_type']] ?? '';
|
|
@@ -601,6 +604,18 @@ class SalesOrderService extends Service
|
|
}
|
|
}
|
|
$sales = $sales[0];
|
|
$sales = $sales[0];
|
|
|
|
|
|
|
|
+ $show = "";
|
|
|
|
+ $dispatch_company = $dispatch[$sales['id']] ?? '';
|
|
|
|
+ if($dispatch_company){
|
|
|
|
+ if($sales['is_confirm']){
|
|
|
|
+ $show = $dispatch_company . '已接收';
|
|
|
|
+ }else{
|
|
|
|
+ $show = '待' . $dispatch_company . '接收';
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ $sales['wx_show'] = $show;
|
|
|
|
+
|
|
$sales_info = SalesOrderInfo::where('del_time',0)
|
|
$sales_info = SalesOrderInfo::where('del_time',0)
|
|
->where('sales_order_id',$sales['id'])
|
|
->where('sales_order_id',$sales['id'])
|
|
->get()->toArray();
|
|
->get()->toArray();
|