bug修改

ship-module-product/ship-module-product-biz/src/main/resources/mapper/pricevoyage/PriceVoyageMapper.xml

@@ -44,7 +44,7 @@
             product_price_room_model t1
                 LEFT JOIN resource_room_model t2 ON t1.room_model_id = t2.id
         WHERE
-                t1.object_id = ( SELECT id FROM product_price_voyage WHERE voyage_id = #{voyageId} AND deleted = 0 )
+            EXISTS (SELECT id FROM product_price_voyage WHERE voyage_id = #{voyageId} and t1.object_id= id AND deleted = 0 )
           AND t1.deleted = 0
           AND t2.deleted = 0
         ORDER BY

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

@@ -193,7 +193,7 @@
              ps.product_tag productTag,ps.product_tag2 productTag2,ps.product_tag3 productTag3,ps.product_tag4 productTag4
         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
+        left JOIN trade_detail tdl on td.id = tdl.order_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