|
@@ -804,14 +804,14 @@ class Tool
|
|
|
$start = Dever::maketime('2022-06-01 00:00:00');
|
|
|
$end = Dever::maketime('2022-06-30 23:59:59');
|
|
|
|
|
|
- $head = array('月份', '商品');
|
|
|
+ $head = array('商品名', '数量', '价格');
|
|
|
$result = array();
|
|
|
if ($data) {
|
|
|
$yes = $no = 0;
|
|
|
$ybody = $nbody = array();
|
|
|
foreach ($data as $k => $v) {
|
|
|
- $buy = Dever::db('shop/sell_order_goods')->find(array('goods_id' => $v['id']));
|
|
|
- if ($buy && $buy['cdate'] >= $start && $buy['cdate'] <= $end) {
|
|
|
+ $buy = Dever::db('shop/sell_order_goods')->getCashNum(array('goods_id' => $v['id'], 'start' => $start, 'end' => $end));
|
|
|
+ if ($buy) {
|
|
|
$yes += 1;
|
|
|
} else {
|
|
|
$no += 1;
|
|
@@ -823,7 +823,7 @@ class Tool
|
|
|
|
|
|
print_r($data);die;
|
|
|
|
|
|
- $file = '商品';
|
|
|
+ $file = '商品购买明细';
|
|
|
return Dever::excelExport($body, $head, $file);
|
|
|
}
|
|
|
}
|