经纬度为空

application/api_broker/service/LocationService.php

@@ -32,6 +32,11 @@ class LocationService
             return $result;
         }
 
+        if ($longitude == '(null)' || $latitude == '(null)')  {
+            $result['msg'] = '经纬度为空';
+            return $result;
+        }
+
         $m_location = new ALocationListModel();
         $position_service = new PositionService();
         $s_redis = new RedisCacheService();

application/index/controller/OfficePayLog.php

@@ -2630,7 +2630,7 @@ class OfficePayLog extends Basic
         if (!empty($this->params['order_id'])) {
             $where['a.order_id'] = $this->params['order_id'];
         }
-
+        $where[] = ['EXP', 'g.id IS NULL OR f.id IS NULL'];
         try {
             $order = new OfficeOPayLogModel();
             $field = 'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,c.name,a.real_money';

application/index/controller/PayLog.php

@@ -83,7 +83,7 @@ class PayLog extends Basic
         if (!empty($this->params['order_id'])) {
             $where['a.order_id'] = $this->params['order_id'];
         }
-
+        $where[] = ['EXP', 'g.id IS NULL OR f.id IS NULL'];
         try {
             $order = new OPayLogModel();
             $field = 'a.create_time,a.id,a.order_id,a.bargain_id,a.income_time,e.name,a.real_money';

application/model/OPayLogModel.php

@@ -759,6 +759,8 @@ class OPayLogModel extends Model
             ->alias("a")
             ->join("o_order b", "a.order_id = b.id", "left")
             ->join('a_agents e', 'a.agent_id=e.id', 'left')
+            ->join('o_refund f', 'a.id=f.pay_log_id', 'left')
+            ->join('o_paylog_adjustment g', 'a.id=g.paylog_id', 'left')
             ->limit($pageSize)
             ->page($pageNo)
             ->order($order_)
@@ -778,6 +780,8 @@ class OPayLogModel extends Model
             ->alias("a")
             ->join("o_order b", "a.order_id = b.id", "left")
             ->join('a_agents e', 'a.agent_id=e.id', 'left')
+            ->join('o_refund f', 'a.id=f.pay_log_id', 'left')
+            ->join('o_paylog_adjustment g', 'a.id=g.paylog_id', 'left')
             ->where($params)
             ->count($field);
     }

application/model/OfficeOPayLogModel.php

@@ -720,6 +720,8 @@ class OfficeOPayLogModel extends Model
             ->alias("a")
             ->join("o_order b", "a.order_id = b.id", "left")
             ->join('a_agents c', 'a.agent_id=c.id', 'left')
+            ->join('o_refund f', 'a.id=f.pay_log_id', 'left')
+            ->join('o_paylog_adjustment g', 'a.id=g.paylog_id', 'left')
             ->limit($pageSize)
             ->page($pageNo)
             ->order($order_)
@@ -739,6 +741,8 @@ class OfficeOPayLogModel extends Model
             ->alias("a")
             ->join("o_order b", "a.order_id = b.id", "left")
             ->join('a_agents c', 'a.agent_id=c.id', 'left')
+            ->join('o_refund f', 'a.id=f.pay_log_id', 'left')
+            ->join('o_paylog_adjustment g', 'a.id=g.paylog_id', 'left')
             ->where($params)
             ->count($field);
     }