分账核验更新

addons/shopro/tests/split_commission_verify.sql

@@ -210,12 +210,13 @@ LEFT JOIN (
   GROUP BY order_id
 ) cr ON cr.order_id = so.order_id
 LEFT JOIN (
-  SELECT order_id,
-    SUM(commission) AS reg_commission,
-    SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS reg_accounted
-  FROM fa_shopro_regional_agent_reward
-  WHERE status >= 0
-  GROUP BY order_id
+  SELECT ro.order_id,
+    SUM(rr.commission) AS reg_commission,
+    SUM(CASE WHEN rr.status = 1 THEN 1 ELSE 0 END) AS reg_accounted
+  FROM fa_shopro_regional_agent_reward rr
+  INNER JOIN fa_shopro_regional_agent_order ro ON ro.id = rr.regional_order_id
+  WHERE rr.status >= 0
+  GROUP BY ro.order_id
 ) rr ON rr.order_id = so.order_id
 LEFT JOIN (
   SELECT order_id,
@@ -231,13 +232,14 @@ LEFT JOIN (
     WHERE cr.status = 1
     GROUP BY cr.order_id
     UNION ALL
-    SELECT rr.order_id, 0,
+    SELECT ro.order_id, 0,
       SUM(CASE WHEN wl.type = 'regional_agent_income' THEN wl.wallet ELSE 0 END)
     FROM fa_shopro_regional_agent_reward rr
+    INNER JOIN fa_shopro_regional_agent_order ro ON ro.id = rr.regional_order_id
     INNER JOIN fa_shopro_user_wallet_log wl
       ON wl.item_id = rr.id AND wl.type = 'regional_agent_income' AND wl.wallet_type = 'money'
     WHERE rr.status = 1
-    GROUP BY rr.order_id
+    GROUP BY ro.order_id
   ) wsum
   GROUP BY order_id
 ) wl ON wl.order_id = so.order_id
@@ -265,8 +267,11 @@ LEFT JOIN (
   FROM fa_shopro_commission_reward WHERE status >= 0 GROUP BY order_id
 ) cr ON cr.order_id = o.id
 LEFT JOIN (
-  SELECT order_id, COUNT(*) AS reward_cnt, SUM(commission) AS reward_sum
-  FROM fa_shopro_regional_agent_reward WHERE status >= 0 GROUP BY order_id
+  SELECT ro.order_id, COUNT(*) AS reward_cnt, SUM(rr.commission) AS reward_sum
+  FROM fa_shopro_regional_agent_reward rr
+  INNER JOIN fa_shopro_regional_agent_order ro ON ro.id = rr.regional_order_id
+  WHERE rr.status >= 0
+  GROUP BY ro.order_id
 ) rr ON rr.order_id = o.id
 LEFT JOIN fa_shopro_split_order so ON so.order_id = o.id AND so.channel = 'huifu'
 WHERE o.pay_type = 'huifu_wechat'
@@ -353,7 +358,10 @@ LEFT JOIN fa_shopro_split_receiver sr ON sr.id = sor.receiver_id
 WHERE sor.split_order_id IN (SELECT id FROM fa_shopro_split_order WHERE order_sn = @order_sn);
 
 SELECT * FROM fa_shopro_commission_reward WHERE order_id = (SELECT id FROM fa_shopro_order WHERE order_sn = @order_sn LIMIT 1);
-SELECT * FROM fa_shopro_regional_agent_reward WHERE order_id = (SELECT id FROM fa_shopro_order WHERE order_sn = @order_sn LIMIT 1);
+SELECT rr.*
+FROM fa_shopro_regional_agent_reward rr
+INNER JOIN fa_shopro_regional_agent_order ro ON ro.id = rr.regional_order_id
+WHERE ro.order_id = (SELECT id FROM fa_shopro_order WHERE order_sn = @order_sn LIMIT 1);
 
 SELECT wl.*
 FROM fa_shopro_user_wallet_log wl
@@ -361,7 +369,11 @@ WHERE wl.wallet_type = 'money'
   AND wl.type IN ('commission_income', 'regional_agent_income', 'commission_back', 'regional_agent_back')
   AND (
     wl.item_id IN (SELECT id FROM fa_shopro_commission_reward WHERE order_id = (SELECT id FROM fa_shopro_order WHERE order_sn = @order_sn LIMIT 1))
-    OR wl.item_id IN (SELECT id FROM fa_shopro_regional_agent_reward WHERE order_id = (SELECT id FROM fa_shopro_order WHERE order_sn = @order_sn LIMIT 1))
+    OR wl.item_id IN (
+      SELECT rr.id FROM fa_shopro_regional_agent_reward rr
+      INNER JOIN fa_shopro_regional_agent_order ro ON ro.id = rr.regional_order_id
+      WHERE ro.order_id = (SELECT id FROM fa_shopro_order WHERE order_sn = @order_sn LIMIT 1)
+    )
   );
 
 SELECT * FROM fa_shopro_huifu_pay_ext WHERE order_id = (SELECT id FROM fa_shopro_order WHERE order_sn = @order_sn LIMIT 1);