mkm/multi-store
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(TradeStatisticLogic): 修改TradeStatisticLogic，优化本月支付人数曲线查询

Browse Source
This commit is contained in:
mkm 2024-06-20 14:45:24 +08:00
parent 24fd63e880
commit b8038b820a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin/logic/statistic/TradeStatisticLogic.php
View File

@ -151,7 +151,6 @@ class TradeStatisticLogic extends BaseLogic
//本月支付人数曲线 //本月支付人数曲线
$monthCurveOrderPeople = $storeOrder->getCurveData($monthOrderPeopleWhere, $where, 'count(distinct uid)'); $monthCurveOrderPeople = $storeOrder->getCurveData($monthOrderPeopleWhere, $where, 'count(distinct uid)');
$monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $timeKey); $monthCurveOrderPeople = $this->trendYdata((array)$monthCurveOrderPeople, $timeKey);
//上月支付人数 //上月支付人数
// $timeKey = $this->TimeConvert("last_month"); // $timeKey = $this->TimeConvert("last_month");

2
app/common/model/store_order/StoreOrder.php
View File

@ -95,7 +95,7 @@ class StoreOrder extends BaseModel
public function getCurveData($where,$time,$str) public function getCurveData($where,$time,$str)
{ {
return $this->where($where) return $this->where($where)
->when(isset($where['timeKey']), function ($query) use ($time,$str) { ->when(isset($time['timeKey']), function ($query) use ($time,$str) {
$query->whereBetweenTime('create_time', $time['timeKey']['start_time'], $time['timeKey']['end_time']); $query->whereBetweenTime('create_time', $time['timeKey']['start_time'], $time['timeKey']['end_time']);
if ($time['timeKey']['days'] == 1) { if ($time['timeKey']['days'] == 1) {
$timeUinx = "%H"; $timeUinx = "%H";