|
@@ -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);
|
|
|
+
|
|
|
+
|
|
|
+ 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);
|