diff --git a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml index 28e47b60e..978dc3e73 100644 --- a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml +++ b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml @@ -396,18 +396,18 @@ SELECT FROM pay_order_v2 AS p LEFT JOIN order_master_v2 AS o ON p.m_order_number = o.order_number - where order_master_v2.org_id = #{orgId} + where o.org_id = #{orgId} - and order_master_v2.shop_id = #{shopId} + and o.shop_id = #{shopId} - and pay_order_v2.created_at >= #{createBegin} + and p.created_at >= #{createBegin} - and pay_order_v2.created_at <= #{createEnd} + and p.created_at <= #{createEnd} - and pay_order_v2.created_by = #{createBy} + and p.created_by = #{createBy} AND ( p.pay_status = 2 OR p.pay_status = 5 OR p.pay_status = 4 ) AND p.pay_type != 29 @@ -424,18 +424,18 @@ SELECT FROM pay_refund_order_v2 AS r LEFT JOIN order_master_v2 AS o ON r.m_order_number = o.order_number - where order_master_v2.org_id = #{orgId} + where o.org_id = #{orgId} - and order_master_v2.shop_id = #{shopId} + and o.shop_id = #{shopId} - and pay_order_v2.created_at >= #{createBegin} + and r.created_at >= #{createBegin} - and pay_order_v2.created_at <= #{createEnd} + and r.created_at <= #{createEnd} - and pay_order_v2.created_by = #{createBy} + and r.created_by = #{createBy} AND ( r.refund_status = 2 ) AND r.pay_type != 29