|
@@ -146,6 +146,10 @@ class ExportFileService extends Service
|
|
|
$product[$value['sales_order_id']][] = $value;
|
|
|
}
|
|
|
|
|
|
+ //金额
|
|
|
+ list($for_amount_list, $for_amount_list1) = (new PaymentReceiptService())->getPaymentReceiptDataCountList(array_column($data,'order_number'));
|
|
|
+ list($getDifferentAmountALL,$getDifferentAmountALL1) = (new ReturnExchangeOrderService())->getDifferentAmountALLNew(array_column($data,'id'));
|
|
|
+
|
|
|
$flag = [];
|
|
|
foreach ($data as $value){
|
|
|
$tmp = $invoiceData[$value->id] ?? [];
|
|
@@ -179,6 +183,10 @@ class ExportFileService extends Service
|
|
|
'other_fee' => "",
|
|
|
'discount_fee' => "",
|
|
|
'contract_fee' => "",
|
|
|
+ 'fee1' => "",
|
|
|
+ 'fee2' => "",
|
|
|
+ 'fee3' => "",
|
|
|
+ 'fee4' => "",
|
|
|
'crt_time' => "",
|
|
|
'crt_name' => "",
|
|
|
'state_title' => "",
|
|
@@ -195,6 +203,22 @@ class ExportFileService extends Service
|
|
|
];
|
|
|
}else{
|
|
|
$flag[] = $val['sales_order_id'];
|
|
|
+
|
|
|
+ //(审核后)
|
|
|
+ //已收
|
|
|
+ $one = $for_amount_list1[$value->order_number . PaymentReceipt::type_one] ?? 0;
|
|
|
+ $red = $for_amount_list1[$value->order_number . PaymentReceipt::type_three] ?? 0;
|
|
|
+ $return_exchange_amount1 = $getDifferentAmountALL1[$value->id] ?? 0;
|
|
|
+ $bad = bcsub($return_exchange_amount1 ,$red,2);
|
|
|
+ //已收金额
|
|
|
+ $fee1 = bcsub($one ,$red,2);
|
|
|
+ //未收金额
|
|
|
+ $fee2 = bcsub(bcsub(bcsub($value->contract_fee, $fee1,2), $bad, 2),$red,2);
|
|
|
+ //红冲金额
|
|
|
+ $fee3 = $red;
|
|
|
+ //坏账金额
|
|
|
+ $fee4 = $bad;
|
|
|
+
|
|
|
$return[] = [
|
|
|
'order_number' => $value->order_number,
|
|
|
'model_type_title' => $model_type_title,
|
|
@@ -206,6 +230,10 @@ class ExportFileService extends Service
|
|
|
'other_fee' => $value->other_fee,
|
|
|
'discount_fee' => $value->discount_fee,
|
|
|
'contract_fee' => $value->contract_fee,
|
|
|
+ 'fee1' => $fee1,
|
|
|
+ 'fee2' => $fee2,
|
|
|
+ 'fee3' => $fee3,
|
|
|
+ 'fee4' => $fee4,
|
|
|
'crt_time' => $crt_time,
|
|
|
'crt_name' => $emp_map[$value->crt_id] ?? "",
|
|
|
'state_title' => $state,
|
|
@@ -225,7 +253,7 @@ class ExportFileService extends Service
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- $header = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','产品合计','其他费用','优惠金额','合同金额','创建时间','创建人','订单状态','发货状态','发货单号','付款方式','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
|
|
|
+ $header = ['合同单号','销售类型','产品类型','签订时间','平台单号','平台类型','产品合计','其他费用','优惠金额','合同金额','已收金额','未收金额','红冲金额','坏账金额','创建时间','创建人','订单状态','发货状态','发货单号','付款方式','产品名称','产品编码','产品规格','产品税率','产品单价','产品数量','产品合同金额'];
|
|
|
|
|
|
return $this->saveExportData($return,$header);
|
|
|
}
|