|
@@ -378,7 +378,7 @@ class Cron
|
|
|
|
|
|
|
|
$where['type'] = 1;
|
|
$where['type'] = 1;
|
|
|
$where['type_id'] = $v['id'];
|
|
$where['type_id'] = $v['id'];
|
|
|
- $cash = Dever::db('shop/buy_order')->getCashNum($where);
|
|
|
|
|
|
|
+ $cash = Dever::db('shop/buy_order_goods')->getCashNum($where);
|
|
|
$data['buy_cash'] = round($cash['total'], 2);
|
|
$data['buy_cash'] = round($cash['total'], 2);
|
|
|
$data['buy_num'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
$data['buy_num'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
|
|
|
|
|
@@ -644,7 +644,7 @@ class Cron
|
|
|
$data['shop_id'] = $v['id'];
|
|
$data['shop_id'] = $v['id'];
|
|
|
$data['month'] = $start;
|
|
$data['month'] = $start;
|
|
|
$info = Dever::db('shop/buy_stat_month')->find($data);
|
|
$info = Dever::db('shop/buy_stat_month')->find($data);
|
|
|
- $data['cash'] = Dever::db('shop/buy_order')->getCashNum($where);
|
|
|
|
|
|
|
+ $data['cash'] = Dever::db('shop/buy_order_goods')->getCashNum($where);
|
|
|
$data['order'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
$data['order'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
|
$data['goods'] = Dever::db('shop/buy_order')->getGoodsNum($where);
|
|
$data['goods'] = Dever::db('shop/buy_order')->getGoodsNum($where);
|
|
|
if (!$info) {
|
|
if (!$info) {
|
|
@@ -682,7 +682,7 @@ class Cron
|
|
|
$data['store_id'] = $v['id'];
|
|
$data['store_id'] = $v['id'];
|
|
|
$data['month'] = $start;
|
|
$data['month'] = $start;
|
|
|
$info = Dever::db('shop/store_stat_month')->find($data);
|
|
$info = Dever::db('shop/store_stat_month')->find($data);
|
|
|
- $data['cash'] = Dever::db('shop/buy_order')->getCashNum($where);
|
|
|
|
|
|
|
+ $data['cash'] = Dever::db('shop/buy_order_goods')->getCashNum($where);
|
|
|
$data['order'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
$data['order'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
|
$data['goods'] = Dever::db('shop/buy_order')->getGoodsNum($where);
|
|
$data['goods'] = Dever::db('shop/buy_order')->getGoodsNum($where);
|
|
|
if (!$info) {
|
|
if (!$info) {
|
|
@@ -720,7 +720,7 @@ class Cron
|
|
|
$data['factory_id'] = $v['id'];
|
|
$data['factory_id'] = $v['id'];
|
|
|
$data['month'] = $start;
|
|
$data['month'] = $start;
|
|
|
$info = Dever::db('shop/factory_stat_month')->find($data);
|
|
$info = Dever::db('shop/factory_stat_month')->find($data);
|
|
|
- $data['cash'] = Dever::db('shop/buy_order')->getCashNum($where);
|
|
|
|
|
|
|
+ $data['cash'] = Dever::db('shop/buy_order_goods')->getCashNum($where);
|
|
|
$data['order'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
$data['order'] = Dever::db('shop/buy_order')->getOrderNum($where);
|
|
|
$data['goods'] = Dever::db('shop/buy_order')->getGoodsNum($where);
|
|
$data['goods'] = Dever::db('shop/buy_order')->getGoodsNum($where);
|
|
|
if (!$info) {
|
|
if (!$info) {
|
rabin