|
@@ -90,12 +90,9 @@ class Task
|
|
|
if ($v['finish_date'] > 0) {
|
|
|
$id = $v['id'];
|
|
|
unset($v['id']);
|
|
|
- $info = Dever::db('order_log3', 'seller')->find(array('order_num' => $v['order_num']));
|
|
|
- if (!$info) {
|
|
|
- $info = Dever::db('order_log3', 'seller')->insert($v);
|
|
|
- if ($info) {
|
|
|
- Dever::db('order_log2', 'seller')->delete($id);
|
|
|
- }
|
|
|
+ $info = Dever::db('order_log3', 'seller')->insert($v);
|
|
|
+ if ($info) {
|
|
|
+ Dever::db('order_log2', 'seller')->delete($id);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -388,17 +385,18 @@ class Task
|
|
|
$where['status'] = 11;
|
|
|
$set['order'] = 'id asc';
|
|
|
$set['limit'] = '0,100000';
|
|
|
- $order = Dever::db('order_log1', 'seller')->load($where, $set);
|
|
|
+ $order = Dever::db('order_log3', 'seller')->load($where, $set);
|
|
|
if ($order) {
|
|
|
foreach ($order as $k => $v) {
|
|
|
$id = $v['id'];
|
|
|
unset($v['id']);
|
|
|
- $info = Dever::db('order_log3', 'seller')->find(array('order_num' => $v['order_num']));
|
|
|
+
|
|
|
+ $info = false;
|
|
|
if (!$info) {
|
|
|
- $info = Dever::db('order_log3', 'seller')->insert($v);
|
|
|
+ $info = Dever::db('order_log1', 'seller')->insert($v);
|
|
|
}
|
|
|
if ($info) {
|
|
|
- Dever::db('order_log1', 'seller')->delete($id);
|
|
|
+ Dever::db('order_log3', 'seller')->delete($id);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -445,13 +443,14 @@ class Task
|
|
|
$num[$v['seller_id']] += $v['num'] * $v['price'];
|
|
|
}
|
|
|
|
|
|
+
|
|
|
$order = Dever::db('order_bak', '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);
|