调整账号额度变化逻辑

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

@@ -7,6 +7,7 @@
  */
 
 namespace app\api\controller\v2\common;
+use app\em\controller\Account;
 use app\em\controller\WriteOff;
 use app\em\model\EmAccount;
 use app\em\model\EmPayment;

application/em/controller/Account.php

@@ -93,4 +93,11 @@ class Account extends Base
         }
         return $account->save();
     }
+
+    public function computerAmount($em_id,$balance){
+        //更新账户余额
+        $account = self::get(['em_id'=>$em_id]);
+        $account->amount  += $balance;
+        return $account->save();
+    }
 }
\ No newline at end of file

application/em/controller/Invoice.php

@@ -178,11 +178,12 @@ class Invoice extends Base
             $eiu->save();
         }
 
-//        //更新电表账户
-//        $useage = \app\em\model\Useage::get(['useage_id' => $uData['useage_id']]);
-//
-//        $account = new Account();
-//        $account->updateAmount($useage->em_id,$inv->payment_amount,0);
+        //更新电表账户
+        $useage = \app\em\model\Useage::get(['useage_id' => $uData['useage_id']]);
+
+        $account = new Account();
+        $pay_amount = 0 - $inv->payment_amount;
+        $account->computerAmount($useage->em_id,$pay_amount);
 
         return  $inv;
     }
@@ -236,6 +237,10 @@ class Invoice extends Base
             $eiu->useage_id = $uData['useage_id'];
             $eiu->save();
         }
+
+        $account = new Account();
+        $pay_amount = 0 - $inv->payment_amount;
+        $account->computerAmount($useage->em_id,$pay_amount);
         return  $inv;
     }
 

application/em/controller/WriteOff.php

@@ -2,7 +2,6 @@
 
 namespace app\em\controller;
 
-use app\em\model\EmAccount;
 use app\em\model\EmInvoice;
 use app\em\model\EmPayment;
 use app\em\model\EmPaymentInvoice;
@@ -89,15 +88,7 @@ class WriteOff extends Controller
                 ->whereIn('status','3,4,5')
                 ->order('payment_id asc')
                 ->select();
-            if($payments->isEmpty()) {
-                $account = EmAccount::get(['account_id'=>$invoice->account_id]);
-                $account->amount  -= $invoice->payment_balance;
-                $account->save();
-
-                $invoice->is_pay = 1;
-                $invoice->save();
-                return '没有找到可销账的缴费单!';
-            }
+            if($payments->isEmpty()) return '没有找到可销账的缴费单!';
         }
         $paymentIds = [];
         foreach ($payments as $payment){
@@ -107,7 +98,6 @@ class WriteOff extends Controller
             'invoice_id' => $invoice->invoice_id
         ];
 
-
         //销账日志
         $logMsg = date('Y-m-d H-i-s').'paymentIds :' .implode('-',$paymentIds) .'invoiceIds :' .implode('-',$invsIds);
         Log::info($logMsg);
@@ -137,7 +127,6 @@ class WriteOff extends Controller
             foreach ($invs as $index => $inv) {
                 if ($inv->payment_balance == 0) continue;
 
-                $dk_balance = 0;
                 $balanceMode = new EmPaymentInvoiceBalance();
                 $balanceMode->payment_id = $payment->payment_id;
                 $balanceMode->invoice_id = $inv->invoice_id;
@@ -145,7 +134,7 @@ class WriteOff extends Controller
                 //如果该缴费单可以完全消除当前账单额度
                 if ($payment->balance >= $inv->payment_balance) {
                     //单笔销账多少
-                    $balanceMode->balance = $dk_balance = $inv->payment_balance;
+                    $balanceMode->balance = $inv->payment_balance;
                     $payment->balance = $payment->balance - $inv->payment_balance;
 
                     //账单额度变化
@@ -161,7 +150,7 @@ class WriteOff extends Controller
                     $inv->payment_balance = $inv->payment_balance - $payment->balance;
                     //缴费额度变化
                     $payment->balance = 0;
-                    $dk_balance = $inv->payment_balance;
+
                 }
 
                 //更新账单状态
@@ -180,17 +169,10 @@ class WriteOff extends Controller
                 $result++;
 
                 $balanceMode->isUpdate(false)->save();
-                if($inv->is_pay != 1) $this->computerAmount($inv->account_id,$dk_balance);
+//                if($inv->is_pay != 1) $this->computerAmount($inv->account_id,$dk_balance);
             }
         }
         $msg = $result == 0 ? '已审核,没有找到可销账的缴费单.' : '已审核,成功销账 '.$result.' 笔账单.';
         return $msg;
     }
-
-    protected function computerAmount($account_id,$balance){
-        //更新账户余额
-        $account = EmAccount::get(['account_id'=>$account_id]);
-        $account->amount  -= $balance;
-        $account->save();
-    }
 }
\ No newline at end of file