|
@@ -411,7 +411,7 @@ class Cron
|
|
|
*/
|
|
|
public function goods_api()
|
|
|
{
|
|
|
- $num = Dever::input('num', 100);
|
|
|
+ $num = Dever::input('num', 5);
|
|
|
$start = Dever::input('start', date('Y-m-d', strtotime('-'.$num.' day')));
|
|
|
$end = Dever::input('end', date('Y-m-d'));
|
|
|
|
|
@@ -432,8 +432,15 @@ class Cron
|
|
|
$data['day'] = $where['start'];
|
|
|
$info = Dever::db('shop/goods_stat')->find($data);
|
|
|
|
|
|
- $data['area'] = $v['area'];
|
|
|
- $data['category'] = $goods_info['category'];
|
|
|
+ $shop = Dever::db('shop/info')->find($data['shop_id']);
|
|
|
+ if ($shop) {
|
|
|
+ $data['area'] = $shop['area'];
|
|
|
+ }
|
|
|
+ $goods_info = Dever::db('goods/info')->find($data['goods_id']);
|
|
|
+ if ($goods_info) {
|
|
|
+ $data['category'] = $goods_info['category'];
|
|
|
+ }
|
|
|
+
|
|
|
$data['cash'] = round($num['cash'], 2);
|
|
|
$data['num'] = round($num['num'], 2);
|
|
|
|