diff --git a/pro_v3.5.1/app/listener/order/Pay.php b/pro_v3.5.1/app/listener/order/Pay.php index 9f658bb4..3b865b78 100644 --- a/pro_v3.5.1/app/listener/order/Pay.php +++ b/pro_v3.5.1/app/listener/order/Pay.php @@ -58,6 +58,13 @@ class Pay implements ListenerInterface $brokerageTiming = sys_config('brokerage_timing', 'on_confirm'); if ($brokerageTiming === 'on_pay' && !empty($orderInfo['uid'])) { try { + // compute() 已将 one_brokerage 写入 DB,重新从 DB 读取最新订单数据再传给 backOrderBrokerage + /** @var \app\services\order\StoreOrderCreateServices $createSvc */ + $createSvc = app()->make(StoreOrderCreateServices::class); + $freshOrder = $createSvc->get($orderInfo['id']); + if ($freshOrder) { + $orderInfo = $freshOrder->toArray(); + } /** @var \app\services\order\StoreOrderTakeServices $takeServices */ $takeServices = app()->make(StoreOrderTakeServices::class); $takeServices->backOrderBrokerage($orderInfo, $userInfo); @@ -231,7 +238,9 @@ class Pay implements ListenerInterface if ($spread_two_uid > 0) { $orderData['spread_two_uid'] = $spread_two_uid; } - if ($cartInfo && (isset($orderInfo['type']) && !in_array($orderInfo['type'], [4, 5, 7, 8]))) { + // fsgx: 报单商品(is_queue_goods=1)需要参与周期佣金计算,不受 type=8 限制 + $isQueueOrder = !empty($orderInfo['is_queue_goods']); + if ($cartInfo && (isset($orderInfo['type']) && (!in_array($orderInfo['type'], [4, 5, 7, 8]) || $isQueueOrder))) { /** @var StoreOrderComputedServices $orderComputed */ $orderComputed = app()->make(StoreOrderComputedServices::class); if ($userServices->checkUserPromoter($spread_uid)) $orderData['one_brokerage'] = $orderComputed->getOrderSumPrice($cartInfo, 'one_brokerage', false); diff --git a/pro_v3.5.1/app/services/order/StoreOrderTakeServices.php b/pro_v3.5.1/app/services/order/StoreOrderTakeServices.php index e04fa957..d7884fcf 100644 --- a/pro_v3.5.1/app/services/order/StoreOrderTakeServices.php +++ b/pro_v3.5.1/app/services/order/StoreOrderTakeServices.php @@ -240,8 +240,9 @@ class StoreOrderTakeServices extends BaseServices //商城分销功能是否开启 0关闭1开启 if (!sys_config('brokerage_func_status')) return true; - // 营销产品不返佣金 - if (!isset($orderInfo['type']) || in_array($orderInfo['type'], [4, 5, 7, 8])) { + // 营销产品不返佣金;但报单商品(is_queue_goods=1)无论 type 均需参与返佣 + $isQueueOrder = !empty($orderInfo['is_queue_goods']); + if (!$isQueueOrder && (!isset($orderInfo['type']) || in_array($orderInfo['type'], [4, 5, 7, 8]))) { return true; } //绑定失效