保管金/意向金去除bargain_id

application/index/controller/Finance.php

@@ -2435,7 +2435,7 @@ class Finance extends Basic
                         $list[$k]['source_id'] = 0;
                     }
 
-                    if ($v['type'] != 10 || $v['type'] != 30) {
+                    if ($v['type'] != 10 && $v['type'] != 30) {
                         $bargain_id = $this->m_bargain->selectBargainByOrderNo('id', ['order_id', $v['order_id']]);
                         $list[$k]['bargain_id'] = $bargain_id[0]['id'];
                     } else {