2

app/Model/SalesOrder.php

@@ -43,6 +43,15 @@ class SalesOrder extends UseScopeBaseModel
         self::Model_type_six => '外贸订单',
     ];
 
+    public static $model_type_title_u8 = [
+        self::Model_type_one => '线下销售',
+        self::Model_type_two => '线下销售',
+        self::Model_type_three => '二手车交易',
+        self::Model_type_four => '线上销售',
+        self::Model_type_five => '二手车加装',
+        self::Model_type_six => '外贸订单',
+    ];
+
     //安装件
     const State_minus_one = -1;//驳回
     const State_zero = 0;//未确认

app/Service/ExportFileService.php

@@ -359,7 +359,7 @@ class ExportFileService extends Service
                             //已收金额
                             $fee1 = bcsub($one ,$red,2);
                             //未收金额
-                            $fee2 = bcsub(bcsub($value->contract_fee, $one), $bad, 2);;
+                            $fee2 = bcsub(bcsub(bcsub($value->contract_fee, $fee1,2), $bad, 2),$red,2);
                             //红冲金额
                             $fee3 = $red;
                             //坏账金额

app/Service/PaymentReceiptService.php

@@ -379,7 +379,7 @@ class PaymentReceiptService extends Service
                 //退货退款
                 $tmp_return = $getDifferentAmountALL[$value['data_order_no']] ?? 0;
                 //收款
-                $total = bcsub(bcsub($total_amount, $tmp_receipt), $tmp_return, 2);
+                $total = bcsub(bcsub($total_amount, $tmp_receipt,2), $tmp_return, 2);
             }elseif($data['type'] == PaymentReceipt::type_three){
                 //红冲 = 审核后的收款金额 - 已红冲
                 //总金额 收款金额(审核后)
@@ -542,7 +542,7 @@ class PaymentReceiptService extends Service
                     //$max = $value['total_amount'] - $tmp_receipt - $tmp_return;
                     $tmp_receipt = $info_array[$value['order_number']] ?? 0;
                     $tmp_return = $return_exchange_array[$value['order_number']] ?? 0;
-                    $max = bcsub(bcsub($value['total_amount'], $tmp_receipt), $tmp_return, 2);
+                    $max = bcsub(bcsub($value['total_amount'], $tmp_receipt,2), $tmp_return, 2);
                     if($map[$value['order_number']] > $max) return [false, $value['order_number'] . '的金额填写上限是' . $max];
                 }
             }elseif($data['type'] == PaymentReceipt::type_three){
@@ -622,7 +622,7 @@ class PaymentReceiptService extends Service
                     //$max = $value['total_amount'] - $tmp_receipt - $tmp_return;
                     $tmp_receipt = $info_array[$value['order_number']] ?? 0;
                     $tmp_return = $return_exchange_array[$value['order_number']] ?? 0;
-                    $max = bcsub(bcsub($value['total_amount'], $tmp_receipt), $tmp_return, 2);
+                    $max = bcsub(bcsub($value['total_amount'], $tmp_receipt,2), $tmp_return, 2);
                     if($map[$value['order_number']] > $max) return [false, $value['order_number'] . '的金额填写上限是' . $max];
                 }
             }elseif($data['type'] == PaymentReceipt::type_three){
@@ -707,7 +707,7 @@ class PaymentReceiptService extends Service
             ->where('a.type',PaymentReceiptInfo::type_three)
             ->where('a.data_order_type',$type)
             ->where('a.data_order_no',$data['data_order_no'])
-            ->select('a.payment_receipt_id','a.data_order_no as order_number','a.amount','a.data_type','b.state','b.payment_receipt_date')
+            ->select('a.payment_receipt_id','a.data_order_no as order_number','a.amount','a.data_type','b.state','b.payment_receipt_date','b.crt_time')
             ->get()->toArray();
 
         $emp_id = PaymentReceiptInfo::where('del_time',0)

app/Service/PurchaseOrderService.php

@@ -265,8 +265,8 @@ class PurchaseOrderService extends Service
         $order['payment_receipt_list'] = (new PaymentReceiptService())->getPaymentReceiptDataList($order,PaymentReceipt::data_type_two);
         //坏账金额 = 已审核退货退款金额 - 红冲金额
         $order['payment_receipt_list']['bad_amount'] = bcsub($order['return_exchange_amount'], $order['payment_receipt_list']['red_amount'],2);
-        //未回款金额 = 总金额 - 已回款金额 - 坏账金额
-        $order['payment_receipt_list']['not_receipt_amount'] = bcsub(bcsub($order['purchase_total'], $order['payment_receipt_list']['receipt_amount']), $order['payment_receipt_list']['bad_amount'], 2);
+        //未回款金额 = 总金额 - 已回款金额 - 坏账金额 - 红冲
+        $order['payment_receipt_list']['not_receipt_amount'] = bcsub(bcsub(bcsub($order['purchase_total'], $order['payment_receipt_list']['receipt_amount'],2), $order['payment_receipt_list']['bad_amount'], 2),$order['payment_receipt_list']['red_amount'],2);
         //回款单信息 审核过的
 
         $order['not_payment_receipt_amount'] =  bcsub($order['purchase_total'],$order['payment_receipt_list']['not_confirm_receipt_amount'],2);
@@ -484,7 +484,7 @@ class PurchaseOrderService extends Service
             $fee1 = bcsub($one1 ,$red,2);
             $data['data'][$key]['fee1'] = $fee1;
             //未收金额
-            $fee2 = bcsub(bcsub($value['purchase_total'], $one1), $bad, 2);;
+            $fee2 = bcsub(bcsub(bcsub($value['purchase_total'], $fee1,2), $bad, 2),$red,2);
             $data['data'][$key]['fee2'] = $fee2;
             //红冲金额
             $data['data'][$key]['fee3'] = $red;

app/Service/SalesOrderService.php

@@ -703,8 +703,8 @@ class SalesOrderService extends Service
         $sales['payment_receipt_list'] = (new PaymentReceiptService())->getPaymentReceiptDataList($sales, PaymentReceipt::data_type_one);
         //坏账金额 = 已审核退货退款金额 - 红冲金额
         $sales['payment_receipt_list']['bad_amount'] = bcsub($sales['return_exchange_amount'], $sales['payment_receipt_list']['red_amount'],2);
-        //未回款金额 = 总金额 - 已回款金额 - 坏账金额
-        $sales['payment_receipt_list']['not_receipt_amount'] = bcsub(bcsub($sales['contract_fee'], $sales['payment_receipt_list']['receipt_amount']), $sales['payment_receipt_list']['bad_amount'], 2);
+        //未回款金额 = 总金额 - 已回款金额 - 坏账金额 - 红冲
+        $sales['payment_receipt_list']['not_receipt_amount'] = bcsub(bcsub(bcsub($sales['contract_fee'], $sales['payment_receipt_list']['receipt_amount'],2), $sales['payment_receipt_list']['bad_amount'], 2),$sales['payment_receipt_list']['red_amount'],2);
         //回款单信息 审核过的
 
         $sales['not_payment_receipt_amount'] = bcsub($sales['contract_fee'],$sales['payment_receipt_list']['not_confirm_receipt_amount'],2);
@@ -1076,7 +1076,7 @@ class SalesOrderService extends Service
             $fee1 = bcsub($one1 ,$red,2);
             $data['data'][$key]['fee1'] = $fee1;
             //未收金额
-            $fee2 = bcsub(bcsub($value['contract_fee'], $one1), $bad, 2);;
+            $fee2 = bcsub(bcsub(bcsub($value['contract_fee'], $fee1,2), $bad, 2),$red,2);
             $data['data'][$key]['fee2'] = $fee2;
             //红冲金额
             $data['data'][$key]['fee3'] = $red;