收付款修改

app/Model/PaymentReceipt.php

@@ -21,9 +21,13 @@ class PaymentReceipt extends UseScopeBaseModel
 
     const type_one = 1; // 收款
     const type_two = 2; // 付款
+    const type_three = 3; // 红冲
+    const type_four = 4; // 坏账
     public static $model_type = [
         self::type_one => '收款',
         self::type_two => '付款',
+        self::type_three => '红冲',
+        self::type_four => '坏账',
     ];
 
     const data_type_one = 1; // 合同

app/Service/PaymentReceiptService.php

@@ -79,6 +79,7 @@ class PaymentReceiptService extends Service
                 foreach ($data['amount_list'] as $value){
                     $insert[] = [
                         'payment_receipt_id' => $model->id,
+                        'data_type' => $data['type'],
                         'data_order_no' => $value['data_order_no'],
                         'data_order_type' => $data['data_type'],
                         'amount' => $value['amount'],
@@ -153,6 +154,7 @@ class PaymentReceiptService extends Service
                 foreach ($data['amount_list'] as $value){
                     $insert[] = [
                         'payment_receipt_id' => $model->id,
+                        'data_type' => $data['type'],
                         'data_order_no' => $value['data_order_no'],
                         'data_order_type' => $data['data_type'],
                         'amount' => $value['amount'],
@@ -422,6 +424,7 @@ class PaymentReceiptService extends Service
         return $data;
     }
 
+    //详情里
     public function getPaymentReceiptDataList($data){
         $data['data_order_no'] = $data['order_number'];
 
@@ -470,11 +473,6 @@ class PaymentReceiptService extends Service
             $amount = $map[$value['id']] ?? 0;
             $order[$key]['amount'] = $amount;
             $finished += $amount;
-//            if($value['state'] == PaymentReceipt::STATE_TWO){
-//                $finished += $amount;
-//            }else{
-//                $not_finished += $amount;
-//            }
         }
 
         $return['receipt_amount'] = $finished;
@@ -485,6 +483,32 @@ class PaymentReceiptService extends Service
         return $return;
     }
 
+    //列表里
+    public function getPaymentReceiptDataCountList($data){
+        $data_order_no = [];
+        foreach ($data as $value){
+            $data_order_no[] = $value['order_number'];
+        }
+        if(empty($data_order_no)) return [];
+
+        $order = PaymentReceiptInfo::where('del_time',0)
+            ->where('type',PaymentReceiptInfo::type_three)
+            ->whereIn('data_order_no',$data_order_no)
+            ->get()->toArray();
+
+        $return = [];
+        foreach ($order as $value){
+            if(isset($return[$value['data_order_no']])){
+                $return[$value['data_order_no']] += $value['amount'];
+            }else{
+                $return[$value['data_order_no']] = $value['amount'];
+            }
+        }
+
+        return $return;
+    }
+
+    //废弃
     public function getPaymentReceiptDeatail($data){
         $customer = PaymentReceipt::where('del_time',0)
             ->where('crt_time',$data['crt_time'])
@@ -548,30 +572,6 @@ class PaymentReceiptService extends Service
         return $customer;
     }
 
-    public function getPaymentReceiptDataCountList($data){
-        $data_order_no = [];
-        foreach ($data as $value){
-            $data_order_no[] = $value['order_number'];
-        }
-        if(empty($data_order_no)) return [];
-
-        $order = PaymentReceiptInfo::where('del_time',0)
-            ->where('type',PaymentReceiptInfo::type_three)
-            ->whereIn('data_order_no',$data_order_no)
-            ->get()->toArray();
-
-        $return = [];
-        foreach ($order as $value){
-            if(isset($return[$value['data_order_no']])){
-                $return[$value['data_order_no']] += $value['amount'];
-            }else{
-                $return[$value['data_order_no']] = $value['amount'];
-            }
-        }
-
-        return $return;
-    }
-
     public function maked(){
         $payment = PaymentReceipt::where('del_time',0)
             ->where('data_order_no','<>','')

app/Service/SalesOrderService.php

@@ -410,6 +410,7 @@ class SalesOrderService extends Service
             $insert = [];
             $insert[] = [
                 'payment_receipt_id' => $model->id,
+                'data_type' => $order['type'],
                 'data_order_no' => $data['order_number'],
                 'data_order_type' => $order['data_type'],
                 'amount' => $order['amount'],