Merge branch 'pre' into 'master'

Pre

See merge request !83

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

@@ -33,7 +33,7 @@
         <result column="price" property="price"/>
         <result column="created_at" property="createdAt"/>
     </resultMap>
-    <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
+    <select id="misRefundList1" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
         SELECT a.*, b.order_code, b.performance_title, d.mailno
         FROM kylin_order_refunds AS a
         JOIN kylin_order_tickets AS b ON a.order_tickets_id = b.order_tickets_id
@@ -78,6 +78,57 @@
         </where>
         ORDER BY a.mid DESC
     </select>
+
+    <select id="misRefundList" resultType="com.liquidnet.service.kylin.dao.OrderRefundDao" resultMap="misRefundListResult">
+        select t.*, b.order_code, b.performance_title from
+            (select a.*, d.mailno
+            from kylin_order_refunds a
+            LEFT JOIN kylin_order_express AS d ON d.order_refunds_id = a.order_refunds_id
+            <where>
+                <if test="orderTicketsId!=''">
+                    AND a.order_tickets_id = #{orderTicketsId}
+                </if>
+                <choose>
+                    <when test="roleType!=''">
+                        <if test="roleType == 1">
+                            AND a.type = 3 AND a.status = 1
+                        </if>
+                        <if test="roleType == 2">
+                            <if test="statusStr == '9'">
+                                AND a.status = 9
+                            </if>
+                            <if test="statusStr 1= '1'">
+                                AND a.status = 1 AND a.type != 3
+                            </if>
+                            <if test="statusStr != '1' and statusStr != '9'">
+                                AND (a.status = 9 OR (a.status = 1 AND a.type != 3)
+                            </if>
+                        </if>
+                    </when>
+                    <otherwise>
+                        <if test="status!=''">
+                            AND a.status IN
+                            <foreach collection="statusStr" item="status" index="index" open="(" close=")" separator=",">
+                                ${status}
+                            </foreach>
+                        </if>
+                    </otherwise>
+                </choose>
+            </where>
+            ORDER BY a.mid DESC
+            ) t
+        JOIN kylin_order_tickets AS b ON t.order_tickets_id = b.order_tickets_id
+        JOIN kylin_order_ticket_relations AS c ON t.order_tickets_id = c.order_id
+        <where>
+            <if test="performancesId!=''">
+                AND c.performance_id = #{performancesId}
+            </if>
+            <if test="orderCode!=''">
+                AND b.order_code = #{orderCode}
+            </if>
+        </where>
+    </select>
+
     <select id="selectRefundingCount" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM kylin_order_refunds AS a