Merge branch 'pre' into 'master'

Pre

See merge request !57

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

@@ -260,7 +260,7 @@
     </select>
 
     <select id="orderScriptDto" parameterType="java.lang.String" resultMap="orderScriptDtoResult">
-        SELECT ot.mid,
+        select s.mid,
         order_tickets_id,
         order_code,
         status,
@@ -268,12 +268,19 @@
         number,
         user_id,
         oc.coupon_code
+        from (SELECT ot.mid,
+        order_tickets_id,
+        order_code,
+        status,
+        ticket_id,
+        number,
+        user_id
         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
-        inner JOIN kylin_order_coupons AS oc ON oc.order_id = ot.order_tickets_id
-        WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -(pay_countdown_minute+1) MINUTE) AND
-        oc.coupon_type != 101
+        WHERE status = 0 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 where oc.coupon_type != 101 or
+        oc.coupon_code is null
         <if test="userId!=''">
             AND user_id = #{userId}
         </if>
@@ -307,8 +314,8 @@
 
         LEFT JOIN (SELECT * FROM kylin_order_express WHERE express_status NOT IN (1, 3)) AS oe ON oe.order_tickets_id =
         kot.order_tickets_id
---         LEFT JOIN (SELECT * FROM kylin_order_express_route ORDER BY mid DESC LIMIT 1) AS oer ON oe.order_express_id =
---         oer.order_express_id
+        -- LEFT JOIN (SELECT * FROM kylin_order_express_route ORDER BY mid DESC LIMIT 1) AS oer ON oe.order_express_id =
+        -- oer.order_express_id
         <where>
             kotr.performance_id = #{performancesId}
             AND kot.get_ticket_type = 'express'
@@ -327,7 +334,9 @@
             <if test="expressContacts != null  and expressContacts != ''">AND kot.express_contacts LIKE concat('%',
                 #{expressContacts}, '%')
             </if>
-            <if test="expressStatus != '' and expressStatus != 1 and expressStatus != 70">AND oe.express_status = ${expressStatus}</if>
+            <if test="expressStatus != '' and expressStatus != 1 and expressStatus != 70">AND oe.express_status =
+                ${expressStatus}
+            </if>
             <if test="expressStatus == 1">AND (oe.express_status IS NULL OR oe.express_status = ${expressStatus})</if>
             <if test="expressStatus == 70">AND (oe.express_status > 3 AND oe.express_status != 80)</if>
             <if test="mailno != ''">AND oe.mailno LIKE concat('%', #{mailno}, '%')</if>