|
|
@@ -671,9 +671,12 @@ class DistributionCommissionClass
|
|
|
|
|
|
/**
|
|
|
* 分销 finishTime:与 xhOrder.successTime 对齐,无则保留库中 finishTime
|
|
|
+ * @param object $order xhOrder
|
|
|
+ * @param array|null $existingRow 已有 xhDistributionOrder 行,首单计佣时为 null
|
|
|
*/
|
|
|
- protected static function resolveDistributionFinishTime($order, array $existingRow)
|
|
|
+ protected static function resolveDistributionFinishTime($order, ?array $existingRow = null)
|
|
|
{
|
|
|
+ $existingRow = $existingRow ?? [];
|
|
|
$fromOrder = self::getSuccessTimeForDistribution($order);
|
|
|
if ($fromOrder !== null) {
|
|
|
return $fromOrder;
|