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

优化

See merge request quanshu/mp-server!831

mp-service/src/main/resources/mapper/admin/TicketMapper.xml

@@ -34,7 +34,7 @@
 
     <select id="getRandOne" resultType="com.qs.mp.admin.domain.Ticket">
       SELECT t2.*
-      FROM (SELECT pkg_id FROM mp_ticket_package WHERE box_id = #{boxId} AND `status` != 3 ORDER BY RAND() LIMIT 1) as t1
+      FROM (SELECT pkg_id FROM mp_ticket_package WHERE box_id = #{boxId} AND sale_status != 3 ORDER BY RAND() LIMIT 1) as t1
              LEFT JOIN mp_ticket t2 on t1.pkg_id = t2.pkg_id
       WHERE t2.`status` = #{status}
       ORDER BY RAND()