|
|
@@ -237,7 +237,7 @@ class SalesOrderService extends Service
|
|
|
try {
|
|
|
DB::beginTransaction();
|
|
|
|
|
|
- SalesOrder::whereIn('id',$data['id'])->update([
|
|
|
+ SalesOrder::where('id',$data['id'])->update([
|
|
|
'del_time'=> time()
|
|
|
]);
|
|
|
SalesOrderInfo::where('del_time',0)
|
|
|
@@ -264,11 +264,14 @@ class SalesOrderService extends Service
|
|
|
->first();
|
|
|
if(empty($sales)) return [false,'销售订单不存在或已被删除'];
|
|
|
$sales = $sales->toArray();
|
|
|
+ $customer = Customer::where('id',$sales['customer_id'])->value('title');
|
|
|
+ $sales['customer_title'] = $customer;
|
|
|
$sales['employee_one'] = $sales['employee_two'] = $sales['employee_three'] = $sales['product'] = [];
|
|
|
$array = [
|
|
|
$sales['order_type'],
|
|
|
$sales['deal_type'],
|
|
|
$sales['contract_state'],
|
|
|
+ $sales['contract_type'],
|
|
|
$sales['car_type'],
|
|
|
$sales['pay_way'],
|
|
|
$sales['send_state'],
|
|
|
@@ -282,6 +285,7 @@ class SalesOrderService extends Service
|
|
|
$sales[$key]['order_type_title'] = $basic_map[$value['order_type']] ?? '';
|
|
|
$sales[$key]['deal_type_title'] = $basic_map[$value['deal_type']] ?? '';
|
|
|
$sales[$key]['contract_state_title'] = $basic_map[$value['contract_state']] ?? '';
|
|
|
+ $sales[$key]['contract_type_title'] = $basic_map[$value['contract_type']] ?? '';
|
|
|
$sales[$key]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
|
|
|
$sales[$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
|
|
|
$sales[$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';
|
cqpCow