Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -459,6 +459,7 @@ public class UserTicketOrderServiceImpl extends
                     redisCache.setCacheObject(onlineTicketId, ticket.getTicketId(), 2, TimeUnit.MINUTES);
                     orderItem.setTicketId(ticket.getTicketId());
                     flag = true;
+                    break;
                 }
                 if (!flag) {
                     throw new ServiceException("支付回调用户线上盲票订单处理，分配票失败。itemId:" + orderItem.getItemId());

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()