调整计算

application/index/controller/Finance.php

@@ -3506,13 +3506,13 @@ class Finance extends Basic
      * @return float|int|string
      */
     private function sumPayLogPriceByType(int $type, int $is_adjustment = 0) {
-        $m_pay = new OPayLogModel();
-
         if ($is_adjustment) {
+            $m_pay_adjustment = new OPayLogAdjustment();
             $where['b.type'] = $type;
             $where['source'] = 2;
-            $price = $m_pay->sumAdjustment('b.money', $where, $is_adjustment);
+            $price = $m_pay_adjustment->sumMoney('a.money', $where, $is_adjustment);
         } else {
+            $m_pay = new OPayLogModel();
             $where['type'] = $type;
             $price = $m_pay->sumAdjustment('real_money', $where, $is_adjustment);
         }

application/model/OPayLogAdjustment.php

@@ -172,4 +172,16 @@ class OPayLogAdjustment extends BaseModel{
             return 0;
         }
     }
+
+    /**
+     * @param $field
+     * @param $where
+     * @return float|int
+     */
+    public function sumMoney($field, $where) {
+        return $this->db_->alias('a')
+            ->join('o_paylog b','a.new_paylog_id=b.id')
+            ->where($where)
+            ->sum($field);
+    }
 }
\ No newline at end of file