Merge branch 'dev' into 'mp-server-test'

查询票包

See merge request quanshu/mp-server!142

mp-service/src/main/resources/mapper/user/UserTicketOrderItemMapper.xml

@@ -20,15 +20,15 @@
 
     <select id="listTicketOrderItemVO" resultMap="BaseResultMap">
         select t1.*
-        from mp_ticket_order_item t1
-        left join mp_ticket_order t2 on t1.order_id = t2.order_id
+        from mp_user_ticket_order_item t1
+        left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
             ${ew.customSqlSegment}
     </select>
 
     <select id="listMyTicketVO" resultType="com.qs.mp.admin.domain.vo.TicketListVO">
         select t1.item_id, t3.*, t4.pic_url
-        from mp_ticket_order_item t1
-         left join mp_ticket_order t2 on t1.order_id = t2.order_id
+        from mp_user_ticket_order_item t1
+         left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
          left join mp_ticket t3 on t1.ticket_id = t3.ticket_id
          left join mp_ticket_box t4 on t3.box_id = t4.box_id
             ${ew.customSqlSegment}
@@ -36,8 +36,8 @@
 
     <select id="countMyTicket" resultType="Integer">
         select count(*)
-        from mp_ticket_order_item t1
-         left join mp_ticket_order t2 on t1.order_id = t2.order_id
+        from mp_user_ticket_order_item t1
+         left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
          left join mp_ticket t3 on t1.ticket_id = t3.ticket_id
             ${ew.customSqlSegment}
     </select>