test

application/api/controller/v2/common/Payment.php

@@ -40,11 +40,8 @@ class Payment
         $paymentFk = (new EmPaymentFk())->get(['oafk_numb' => $numb]);
         $payment = (new EmPayment())->get(['payment_id' => $paymentFk->payment_id]);
 
-        if($payment->payment_type == 2){
-            $account = EmAccount::get(['account_id'=>$payment->account_id]);
-            $account->amount += $payment->amount ;
-            $account->save();
-        }
+        //更新账户余额
+        (new Account())->computerAmountFromPay($payment->account_id,$payment->amount);
 
         $res = (new WriteOff())->writeOffFromPayment($payment->payment_id);
 

application/em/controller/Account.php

@@ -2,6 +2,7 @@
 namespace app\em\controller;
 use app\admin\controller\Base;
 use app\em\model\EmAccount;
+use app\em\model\EmAccountAmount;
 
 /**
  * 电表账户
@@ -94,10 +95,33 @@ class Account extends Base
         return $account->save();
     }
 
-    public function computerAmount($em_id,$balance){
+    public function computerAmountFromInv($em_id,$balance,$invoice_id = ''){
         //更新账户余额
         $account = (new EmAccount())->get(['em_id'=>$em_id]);
+        $account->amount  -= $balance;
+
+        if($res = $account->save()){
+            $this->recordAmount($invoice_id,'抄表单',$balance);
+        }
+        return $res;
+    }
+
+    public function computerAmountFromPay($account_id,$balance){
+        //更新账户余额
+        $account = (new EmAccount())->get(['account_id'=>$account_id]);
         $account->amount  += $balance;
-        return $account->save();
+
+        if($res = $account->save()){
+            $this->recordAmount($account_id,'缴费单',$balance);
+        }
+        return $res;
+    }
+
+    protected function recordAmount($numb,$type,$amount){
+        $record = new EmAccountAmount();
+        $record->numb = $numb;
+        $record->amount = $amount;
+        $record->type = $type;
+        return $record->save();
     }
 }
\ No newline at end of file

application/em/controller/Invoice.php

@@ -238,9 +238,7 @@ class Invoice extends Base
             $eiu->save();
         }
 
-        $account = new Account();
-        $pay_amount = 0 - $inv->payment_amount;
-        $account->computerAmount($useage->em_id,$pay_amount);
+        (new Account())->computerAmountFromInv($useage->em_id,$inv->payment_amount,$inv->invoice_id);
         return  $inv;
     }
 

application/em/model/EmAccountAmount.php

+<?php
+
+namespace app\em\model;
+
+
+class EmAccountAmount extends Base
+{
+    protected $table  = 'em_account_amount';
+}
\ No newline at end of file