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

feat: 修改了交易统计逻辑，移除了不必要的余额支付计算，并调整了线下收款和总交易额的计算方式。

Browse Source
This commit is contained in:
mkm 2024-06-22 11:19:56 +08:00
parent 22579a624a
commit 2a95eb8e1f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,7 +296,6 @@ class TradeStatisticLogic extends BaseLogic
$outYeOrderChain = countRate($outYeOrderMoney, $lastOutYeOrderMoney); $outYeOrderChain = countRate($outYeOrderMoney, $lastOutYeOrderMoney);
//余额支付 //余额支付
$outYeMoney = $outYeOrderMoney; $outYeMoney = $outYeOrderMoney;
$lastOutYeMoney = $lastOutYeOrderMoney;
$outYeCurve = $this->totalArrData([$outYeOrderCurve, 0]); $outYeCurve = $this->totalArrData([$outYeOrderCurve, 0]);
$outYeChain = countRate($outYeOrderChain, 0); $outYeChain = countRate($outYeOrderChain, 0);
$topData[7] = [ $topData[7] = [
@ -454,9 +453,10 @@ class TradeStatisticLogic extends BaseLogic
//购买会员收入 //购买会员收入
$inMemberMoney = $this->getMemberTotalMoney($where, $selectType, "", $isNum); $inMemberMoney = $this->getMemberTotalMoney($where, $selectType, "", $isNum);
//线下收款收入 //线下收款收入
$inOfflineMoney = $this->getOfflineTotalMoney($where, $selectType, "", $isNum); // $inOfflineMoney = $this->getOfflineTotalMoney($where, $selectType, "", $isNum);
//总交易额 //总交易额
$inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), bcadd($inMemberMoney, $inOfflineMoney, 2), 2);/* - $outExtractUserMoney*/ // $inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), bcadd($inMemberMoney, $inOfflineMoney, 2), 2);/* - $outExtractUserMoney*/
$inTotalMoney = bcadd(bcadd($inOrderMoney, $inRechargeMoney, 2), $inMemberMoney, 2);/* - $outExtractUserMoney*/
return $inTotalMoney; return $inTotalMoney;
} }