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

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -280,7 +280,7 @@
         FROM kylin_order_tickets AS ot
         inner JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
         inner JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
-        WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at, INTERVAL -(pay_countdown_minute + 1) MINUTE)) as s
+        WHERE status = 0 AND ot.coupon_type !='exchange' AND NOW() > DATE_SUB(ot.created_at, INTERVAL -(pay_countdown_minute + 1) MINUTE)) as s
         left JOIN kylin_order_coupons AS oc ON oc.order_id = s.order_tickets_id
         <if test="userId!=''">
             AND user_id = #{userId}