rabin 1 рік тому
батько
коміт
27695bba64

+ 2 - 2
src/dai/seller/api/Manage.php

@@ -11,7 +11,7 @@ class Manage extends Auth
 
     public function showOrderLogExpand($value = false)
     {
-        $data = Dever::db('order_log', 'seller')->find($value);
+        $data = Dever::db('order_log1', 'seller')->find($value);
         return Dever::load('manage', 'seller')->showOrderExpand($data);
     }
 
@@ -23,7 +23,7 @@ class Manage extends Auth
 
     public function showOrderLogExpandKm($value = false)
     {
-        $data = Dever::db('order_log', 'seller')->find($value);
+        $data = Dever::db('order_log1', 'seller')->find($value);
         return Dever::load('manage', 'seller')->showOrderExpandKm($data);
     }
 

+ 1 - 1
src/dai/seller/api/Order.php

@@ -50,7 +50,7 @@ class Order
         }
         $info = Dever::db('order', 'seller')->find(array('seller_order_num' => $order_num));
         if (!$info) {
-            $info = Dever::db('order_log', 'seller')->find(array('seller_order_num' => $order_num));
+            $info = Dever::db('order_log1', 'seller')->find(array('seller_order_num' => $order_num));
             if (!$info) {
                 Dever::error('订单不存在');
             }

+ 1 - 1
src/dai/seller/api/Task.php

@@ -192,7 +192,7 @@ class Task
         $where['status'] = 1;
         $seller = Dever::db('info', 'seller')->load($where);
         foreach ($seller as $k => $v) {
-            $data = Dever::db('log', 'seller')->select(array('seller_id' => $v['id']), array('col' => 'sum(cash)'));
+            $data = Dever::db('log1', 'seller')->select(array('seller_id' => $v['id']), array('col' => 'sum(cash)'));
             if ($data && isset($data[0]['sum'])) {
                 //$sum = $data[0]['sum'] - $v['credit'];
                 $sum = $data[0]['sum'];

+ 1 - 1
src/dai/seller/lib/Order.php

@@ -62,7 +62,7 @@ class Order
                 Dever::load('info', 'seller')->log($order['seller_id'], $order['id'], $order['price'], 4);
             }
             # 将记录写到influx中
-            Dever::db('order_log', 'seller')->insert($order);
+            Dever::db('order_log1', 'seller')->insert($order);
         }
         return $data;
     }

+ 2 - 2
src/dai/seller/table/manage/order_log_list.php

@@ -3,8 +3,8 @@ $status = Dever::input('search')['status'] ?? array('>=', 10);
 return array
 (
     //'source' => 'seller/order_log',
-    'source' => 'seller/order_bak',
-    //'source' => 'seller/order_log1',
+    //'source' => 'seller/order_bak',
+    'source' => 'seller/order_log1',
     'list' => array
     (
         //'expand' => 'seller/manage.showOrderExpand',