分账核验更新

addons/shopro/library/split/SplitCalculator.php

@@ -58,6 +58,20 @@ class SplitCalculator
         return $items;
     }
 
+    protected function getRegionalRewardsByOrderId($orderId)
+    {
+        try {
+            return RegionalReward::where('order_id', $orderId)->where('status', '>=', 0)->select();
+        } catch (\Exception $e) {
+            return RegionalReward::alias('rr')
+                ->join('shopro_regional_agent_order ro', 'ro.id = rr.regional_order_id')
+                ->where('ro.order_id', $orderId)
+                ->where('rr.status', '>=', 0)
+                ->field('rr.*')
+                ->select();
+        }
+    }
+
     protected function calculateFromCommission($orderId)
     {
         $items = [];
@@ -80,7 +94,7 @@ class SplitCalculator
             $items[] = $this->buildItem('promoter', $userId, $receiver, $amount, '推广员差价');
         }
 
-        $regionalRewards = RegionalReward::where('order_id', $orderId)->where('status', '>=', 0)->select();
+        $regionalRewards = $this->getRegionalRewardsByOrderId($orderId);
         foreach ($regionalRewards as $reward) {
             $receiver = $this->getReceiver('regional_agent', $reward['agent_user_id']);
             if (!$receiver) {