feat: 完善商品计奖隔离、积分商城兑换券抵扣与下线售后退款入口
这个提交包含在:
@@ -64,10 +64,7 @@ class DailySettleService
|
||||
|
||||
$orders = $rateService->qualifiedOrderQuery($start, $end)->field('o.id,o.pay_fee')->select();
|
||||
$orderCount = count($orders);
|
||||
$gmv = 0;
|
||||
foreach ($orders as $order) {
|
||||
$gmv = bcadd((string) $gmv, (string) $order['pay_fee'], 2);
|
||||
}
|
||||
$gmv = $rateService->qualifiedGmv($start, $end);
|
||||
|
||||
$windowStart = strtotime($settleDate . ' 00:00:00') - (PartnerConfig::activeDays() - 1) * 86400;
|
||||
$tasterIds = $active->activeUserIds($windowStart, $end);
|
||||
@@ -214,10 +211,7 @@ class DailySettleService
|
||||
|
||||
$orders = $rateService->qualifiedOrderQuery($start, $end)->field('o.id,o.pay_fee')->select();
|
||||
$orderCount = count($orders);
|
||||
$gmv = 0;
|
||||
foreach ($orders as $order) {
|
||||
$gmv = bcadd((string) $gmv, (string) $order['pay_fee'], 2);
|
||||
}
|
||||
$gmv = $rateService->qualifiedGmv($start, $end);
|
||||
|
||||
$windowStart = strtotime($settleDate . ' 00:00:00') - (PartnerConfig::activeDays() - 1) * 86400;
|
||||
$tasterIds = $active->activeUserIds($windowStart, $end);
|
||||
|
||||
在新工单中引用
屏蔽一个用户