edit

src/dai/seller/api/Manage.php

@@ -71,7 +71,7 @@ class Manage extends Auth
                     $msg = 'error';
                 }
                 if ($msg) {
-                    Dever::load('order', 'seller')->notify($v, $msg, array(), 1000);
+                    Dever::load('order', 'seller')->notify($v, $msg, array(), 1000, 1, 'order_log1');
                 }
             }
         } else {
@@ -94,7 +94,7 @@ class Manage extends Auth
                     $msg = 'error';
                 }
                 if ($msg) {
-                    Dever::load('order', 'seller')->notify($v, $msg, array(), 1000);
+                    Dever::load('order', 'seller')->notify($v, $msg, array(), 1000, 1, 'order_log2');
                 }
             }
         } else {

src/dai/seller/lib/Order.php

@@ -186,7 +186,7 @@ class Order
     }
 
     # 向商户发起回调
-    public function notify($info, $msg, $update = array(), $total = 5, $oper = 1)
+    public function notify($info, $msg, $update = array(), $total = 5, $oper = 1, $table = 'order')
     {
         $seller = Dever::db('info', 'seller')->find($info['seller_id']);
         $status = 11;
@@ -242,19 +242,19 @@ class Order
             $update['finish'] = 1;
             $update['finish_date'] = time();
             $info = array_merge($info, $update);
-            $this->finish($info, $oper);
+            $this->finish($info, $oper, $table);
         }
         if (!$info['order_num']) {
             $update['order_num'] = $this->createOrder();
         }
         if ($update) {
-            Dever::db('order', 'seller')->update($id, $update);
+            Dever::db($table, 'seller')->update($id, $update);
         }
         
         return $msg;
     }
 
-    public function finish($info, $oper = 1)
+    public function finish($info, $oper = 1, $table = 'order')
     {
         if ($info['status'] == 10) {
             if ($info['channel_id']) {
@@ -290,7 +290,7 @@ class Order
                 $channel_num = Dever::db('channel', 'seller')->count(array('seller_id' => $info['seller_id'], 'goods_id' => $info['goods_id'], 'status' => 1));
                 if ($channel_num > 1 && $info['channel_id']) {
                     $info['status'] = 2;
-                    Dever::db('order', 'seller')->update($info['id'], array('status' => 2, 'finish' => 2, 'finish_date' => '0'));
+                    Dever::db($table, 'seller')->update($info['id'], array('status' => 2, 'finish' => 2, 'finish_date' => '0'));
                     # 记录渠道错误信息
                     $selected = array();
                     $selected[$info['channel_id']] = true;
@@ -324,11 +324,13 @@ class Order
             # 失败，余额加回来
             Dever::load('info', 'seller')->inc($info['seller_id'], $info['price']);
             //Dever::load('info', 'seller')->log($info['seller_id'], $info['id'], $info['price'], 4);
-            $id = $info['id'];
-            unset($info['id']);
-            $state = Dever::db('order_log2', 'seller')->insert($info);
-            if ($state) {
-                Dever::db('order', 'seller')->delete($id);
+            if ($table == 'order') {
+                $id = $info['id'];
+                unset($info['id']);
+                $state = Dever::db('order_log2', 'seller')->insert($info);
+                if ($state) {
+                    Dever::db($table, 'seller')->delete($id);
+                }
             }
         }