edit

src/dai/seller/api/Manage.php

@@ -129,14 +129,14 @@ class Manage extends Auth
             $option = array();
             foreach ($sku as $k => $v) {
                 if ($v['key'] != -1) {
-                    /*
+                    
                     $spec = Dever::db('info_spec_value', 'goods')->find(array('id' => array('in', $v['key'])), array('col' => 'id,group_concat(value) as name', 'group' => 'info_id'));
                     if ($spec) {
                         $spec['id'] = $v['id'];
                         $result['sku_id']['value'] = $v['id'];
                         $option[] = $spec;
-                    }*/
-
+                    }
+                    /*
                     $spec = Dever::db('info_spec_value', 'goods')->select(array('id' => array('in', $v['key'])));
 
                     if ($spec) {
@@ -149,7 +149,7 @@ class Manage extends Auth
                         $spec_value['id'] = $v['id'];
                         $result['sku_id']['value'] = $v['id'];
                         $option[] = $spec_value;
-                    }
+                    }*/
 
                 } else {
                     $result['sku_id']['value'] = $v['id'];

src/dai/seller/api/Task.php

@@ -41,8 +41,9 @@ class Task
     # 将数据推到子进程处理
     private function popen($order)
     {
-        $command = 'php /www/'.DEVER_PROJECT.'/src/dai/seller/index.php \'{"l":"task.run","order":"'.Str::encode($order).'"}\'';
-        Cmd::shell($command);
+        //$command = 'php /www/'.DEVER_PROJECT.'/src/dai/seller/index.php \'{"l":"task.run","order":"'.Str::encode($order).'"}\'';
+        //Cmd::shell($command);
+        Cmd::run('task.run', array('order' => Str::encode($order)), 'seller');
     }
 
     # 获取当前执行的子进程数量
@@ -207,6 +208,7 @@ class Task
     # 每小时统计一次正确的商户余额
     public function yue()
     {
+        $this->cash();
         return;
         $where['status'] = 1;
         $seller = Dever::db('info', 'seller')->load($where);
@@ -337,8 +339,8 @@ class Task
     # 计算正确的余额
     public function cash()
     {
-        $where['status'] = 10;
-        $order = Dever::db('order_log1', 'seller')->select($where);
+        $where['status'] = array('!=', 11);
+        $order = Dever::db('order', 'seller')->select($where);
         $num = array();
         foreach ($order as $k => $v) {
             if (!isset($num[$v['seller_id']])) {
@@ -346,6 +348,14 @@ class Task
             }
             $num[$v['seller_id']] += $v['num'] * $v['price'];
         }
+        
+        $order = Dever::db('order_log1', 'seller')->select($where);
+        foreach ($order as $k => $v) {
+            if (!isset($num[$v['seller_id']])) {
+                $num[$v['seller_id']] = 0;
+            }
+            $num[$v['seller_id']] += $v['num'] * $v['price'];
+        }
 
         foreach ($num as $k => $v) {
             $seller = Dever::db('info', 'seller')->find($k);