edit

journal/lib/Pay.php

@@ -14,7 +14,7 @@ class Pay
         $where['code'] = 'null';
         $where['type'] = 3;
         $where['status'] = 2;
-        $data = Dever::db('journal/order')->getUnCode($where);
+        $data = Dever::db('act/order')->getUnCode($where);
         echo Dever::sql();
         if ($data) {
             print_r($data);die;
@@ -40,7 +40,7 @@ class Pay
                 }
 
                 $update['where_id'] = $order['id'];
-                Dever::db('journal/order')->update($update);
+                Dever::db('act/order')->update($update);
             }
         }
     }
@@ -60,7 +60,7 @@ class Pay
 
         if ($status == 5 && $id > 0) {
             $send = array();
-            $info = Dever::db('journal/order')->one($id);
+            $info = Dever::db('act/order')->one($id);
             $send['pay_project_id'] = 1;
             $send['pay_uid'] = $info['uid'];
             $send['pay_order_id'] = $info['order_id'];
@@ -96,7 +96,7 @@ class Pay
             $status = $send['pay_status'];
             $msg = $send['pay_msg'];
 
-            $order = Dever::db('journal/order')->one(array('order_id' => $order_id, 'uid' => $uid));
+            $order = Dever::db('act/order')->one(array('order_id' => $order_id, 'uid' => $uid));
 
             if ($send['pay_status'] == 2 && $order) {
                 
@@ -132,7 +132,7 @@ class Pay
                 }
                 */
 
-                Dever::db('journal/order')->update($update);
+                Dever::db('act/order')->update($update);
 
                 if ($order['type'] != 1) {
                     return;
@@ -193,7 +193,7 @@ class Pay
                 }
 
             } else {
-                Dever::db('journal/order')->update(array('where_id' => $order['id'], 'status' => 3));
+                Dever::db('act/order')->update(array('where_id' => $order['id'], 'status' => 3));
             }
         }
 	}

main/src/Journal.php

@@ -961,7 +961,7 @@ class Journal extends Core
             $order_data['seller_id'] = $seller;
         }
 
-        $id = Dever::db('journal/order')->insert($order_data);
+        $id = Dever::db('act/order')->insert($order_data);
 
         if (!$id) {
             Dever::alert('支付失败');
@@ -1050,7 +1050,7 @@ class Journal extends Core
     # 兑换
     public function code()
     {
-        //return Dever::load('main/journal_v1')->code();
+        return Dever::load('main/journal_v1')->code();
         if (!$this->data['uid']) {
             Dever::alert('错误的用户信息');
         }