Merge branch '0416-v3.2.5' of https://gitee.com/zwyjjc/tl_estate into 0416-v3.2.5

application/api/service/AccountBalanceService.php

 <?php
 namespace app\api\service;
 
+use app\model\CCoupon;
 use app\model\UAccountBalance;
 use app\model\UAccountCheck;
 use app\model\Users;
@@ -43,10 +44,6 @@ class AccountBalanceService{
 
 
 
-
-    //todo 后台账户明细表
-
-
     /**
      * 账户明细列表
      * @param $params
@@ -54,9 +51,28 @@ class AccountBalanceService{
      */
     public function getBalanceList($params){
         $res = $this->m_account_balance->getBalanceList($params);
+        foreach ($res as $key => $value) {
+            $res[$key]['order_id'] = 0;
+            if($value['is_essay'] == 1 && $value['source_type'] == 0){
+                $res[$key]['order_id'] = $this->getOrderId($value['source_id']);
+            }
+        }
         return $res;
     }
 
+    public function getOrderId($source_id){
+        $m_coupon = new CCoupon();
+        $params['id'] = $source_id;
+        $params['status'] = 1;
+        $field = 'order_id';
+        $res = $m_coupon->getCoupon($field,$params);
+        if($res){
+            return $res[0]['order_id'];
+        }else{
+            return 0;
+        }
+    }
+
     public function getBalanceCount($params){
         $balanceCount = $this->m_account_balance->getBalanceCount($params);
         $accountCheckModel = new UAccountCheck();

application/index/controller/Finance.php

@@ -2499,7 +2499,7 @@ class Finance extends Basic
             $m_partial = new OPartialCommission();
             $m_partial->editData(['is_del'=>1], $this->params['partial_id'], 'bargain_id');
 
-            $this->updatePerformance($this->params['partial_id']);
+            $this->updatePerformance(0, $this->params['partial_id']);
 
             $m_tax = new OTaxes();
             $m_tax->updateData(['is_del'=>1],['agent_id'=>$agent_id,'bargain_id'=>$partial_id]);
@@ -2720,10 +2720,11 @@ class Finance extends Basic
      */
     private function updatePerformanceAll(int $bargain_id = 0): array
     {
+        $data['status'] = 'fail';
         try {
             $where = $update_data = [];
             if ($bargain_id) {
-                $where['b.id'] = $bargain_id;
+                $where[] = ['EXP','b.id = '.$bargain_id. ' OR b.father_id='.$bargain_id];
             }
             if (!empty($where)) {
                 //获取被修改人信息
@@ -2733,10 +2734,9 @@ class Finance extends Basic
                     $create_time = date('Y-m-d', strtotime($v['create_time']));
                     $this->totalOfficialReceipts($v['id'], $v['district_id'], $v['store_id'], $create_time);
                 }
+                $data['status'] = 'successful';
             }
-            $data['status'] = 'successful';
         } catch (\Exception $e) {
-            $data['status'] = 'fail';
             $data['msg'] = '内部错误:'.$e->getMessage();
         }