Merge remote-tracking branch 'origin/main' into main

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -194,7 +194,7 @@
         FROM trade_order td
         INNER JOIN trade_order_user tou on td.id = tou.order_id
         INNER JOIN trade_detail tdl on td.id = tdl.order_id
-        INNER JOIN product_spu ps on ps.id = tdl.product_id
+        left JOIN product_spu ps on ps.id = tdl.product_id
         LEFT JOIN ota_distributor od on od.id = td.source_id
         LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2  where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
         where 1= 1