1

app/Service/PaymentReceiptService.php

@@ -463,11 +463,13 @@ class PaymentReceiptService extends Service
             $order[$key]['state_title'] = PaymentReceipt::$name[$value['state']] ?? '';
             $order[$key]['payment_receipt_date'] = $value['payment_receipt_date'] ? date('Y-m-d',$value['payment_receipt_date']) : '';
             $amount = $map[$value['id']] ?? 0;
-            if($value['state'] == PaymentReceipt::STATE_TWO){
-                $finished += $amount;
-            }else{
-                $not_finished += $amount;
-            }
+            $order[$key]['amount'] = $amount;
+            $finished += $amount;
+//            if($value['state'] == PaymentReceipt::STATE_TWO){
+//                $finished += $amount;
+//            }else{
+//                $not_finished += $amount;
+//            }
         }
 
         $return['receipt_amount'] = $finished;

app/Service/PurchaseOrderService.php

@@ -272,7 +272,7 @@ class PurchaseOrderService extends Service
         //收付款单信息
         $order['payment_receipt_list'] = (new PaymentReceiptService())->getPaymentReceiptDataList($order);
         $order['payment_receipt_list']['not_receipt_amount'] = $order['purchase_total'] - $order['payment_receipt_list']['receipt_amount'];
-        $order['payment_receipt_amount'] = $order['payment_receipt_list']['not_receipt_amount'];
+        $order['not_payment_receipt_amount'] = $order['payment_receipt_list']['not_receipt_amount'];
 
         return [true, $order];
     }

app/Service/SalesOrderService.php

@@ -662,7 +662,7 @@ class SalesOrderService extends Service
         //收付款单信息
         $sales['payment_receipt_list'] = (new PaymentReceiptService())->getPaymentReceiptDataList($sales);
         $sales['payment_receipt_list']['not_receipt_amount'] = $sales['contract_fee'] - $sales['payment_receipt_list']['receipt_amount'];
-        $sales['payment_receipt_amount'] = $sales['payment_receipt_list']['not_receipt_amount'];
+        $sales['not_payment_receipt_amount'] = $sales['payment_receipt_list']['not_receipt_amount'];
 
         //详情里的收付款信息
 //        $sales['payment_receipt'] = (new PaymentReceiptService())->getPaymentReceiptDeatail($sales);