|
@@ -85,9 +85,11 @@ class Cron
|
|
$data['shop_id'] = $v['id'];
|
|
$data['shop_id'] = $v['id'];
|
|
$data['day'] = $where['start'];
|
|
$data['day'] = $where['start'];
|
|
$info = Dever::db('shop/sell_stat')->find($data);
|
|
$info = Dever::db('shop/sell_stat')->find($data);
|
|
- $data['cash'] = Dever::db('shop/sell_order')->getCashNum($where);
|
|
|
|
|
|
+ $cash = Dever::db('shop/sell_order')->getCashNum($where);
|
|
|
|
+ $data['cash'] = $cash['total'];
|
|
$data['order'] = Dever::db('shop/sell_order')->getOrderNum($where);
|
|
$data['order'] = Dever::db('shop/sell_order')->getOrderNum($where);
|
|
- $data['goods'] = Dever::db('shop/sell_order')->getGoodsNum($where);
|
|
|
|
|
|
+ $goods = Dever::db('shop/sell_order')->getGoodsNum($where);
|
|
|
|
+ $data['goods'] = $goods['total'];
|
|
$data['area'] = $v['area'];
|
|
$data['area'] = $v['area'];
|
|
$data['province'] = $v['province'];
|
|
$data['province'] = $v['province'];
|
|
$data['city'] = $v['city'];
|
|
$data['city'] = $v['city'];
|
|
@@ -120,16 +122,22 @@ class Cron
|
|
$where['shop_id'] = $v['id'];
|
|
$where['shop_id'] = $v['id'];
|
|
for($i=0; $i<=$day; $i++) {
|
|
for($i=0; $i<=$day; $i++) {
|
|
$where['start'] = $start + 86400*$i;
|
|
$where['start'] = $start + 86400*$i;
|
|
- $where['end'] = $start + 86400*$i + 86399;
|
|
|
|
|
|
+ //$where['end'] = $start + 86400*$i + 86399;
|
|
$data = array();
|
|
$data = array();
|
|
$data['type'] = 1;
|
|
$data['type'] = 1;
|
|
$data['type_id'] = $v['id'];
|
|
$data['type_id'] = $v['id'];
|
|
$data['day'] = $where['start'];
|
|
$data['day'] = $where['start'];
|
|
$info = Dever::db('shop/buy_stat')->find($data);
|
|
$info = Dever::db('shop/buy_stat')->find($data);
|
|
- $data['cash'] = Dever::db('shop/buy_order')->getCashNum($where);
|
|
|
|
- $data['p_cash'] = Dever::db('shop/buy_order')->getPCashNum($where);
|
|
|
|
|
|
+ $cash = Dever::db('shop/buy_order')->getCashNum($where);
|
|
|
|
+ $data['cash'] = $cash['total'];
|
|
|
|
+ $cash = Dever::db('shop/buy_order')->getPCashNum($where);
|
|
|
|
+ $data['p_cash'] = $cash['total'];
|
|
|
|
+
|
|
$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);
|
|
|
|
|
|
+ $goods = Dever::db('shop/buy_order')->getGoodsNum($where);
|
|
|
|
+
|
|
|
|
+ $data['goods'] = $goods['total'];
|
|
|
|
+
|
|
$data['area'] = $v['area'];
|
|
$data['area'] = $v['area'];
|
|
$data['province'] = $v['province'];
|
|
$data['province'] = $v['province'];
|
|
$data['city'] = $v['city'];
|
|
$data['city'] = $v['city'];
|