Merge remote-tracking branch 'origin/master'

qmjszx-admin/src/main/resources/templates/admissionticket/admissionTicket.html

@@ -58,8 +58,8 @@
                     checkbox: true
                 },
                 {
-                    field: 'venueId',
-                    title: '场馆id'
+                    field: 'venueName',
+                    title: '场馆名称'
                 },
                 {
                     field: 'siteName',
@@ -86,7 +86,7 @@
                 },
                 {
                     field: 'admissionTicketStatus',
-                    title: '时段状态',
+                    title: '预定状态',
                     formatter: function (value, row, index) {
                         return statusTools(row);
                     }
@@ -98,9 +98,16 @@
         function statusTools(row) {
             if (row.admissionTicketStatus === "0") {
                 return '<i class=\"fa fa-toggle-off text-info fa-2x\" onclick="enable(\'' + row.id + '\')"></i> ';
-            } else {
+            }else if(row.admissionTicketStatus === "1"){
                 return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.id + '\')"></i> ';
+            }else if(row.admissionTicketStatus === "2"){
+                return "已预定"
+            }else if(row.admissionTicketStatus === "3"){
+                return "已锁定"
             }
+            /*else {
+                return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.id + '\')"></i> ';
+            }*/
         }
 
         /* 用户管理-停用 */

qmjszx-business/src/main/java/beilv/admissionticket/domain/AdmissionTicket.java

@@ -53,4 +53,9 @@ public class AdmissionTicket {
      */
     private String venueName;
 
+    /**
+     * 排序
+     */
+    private int sort;
+
 }

qmjszx-business/src/main/java/beilv/session/domain/BeilvSession.java

@@ -28,7 +28,7 @@ public class BeilvSession extends BaseEntity
 
     /** 排序 */
     @Excel(name = "排序")
-    private String sort;
+    private Integer sort;
 
     /** 时段 */
     @Excel(name = "时段")

qmjszx-business/src/main/resources/mapper/admissionticket/AdmissionTicketMapper.xml

@@ -14,11 +14,12 @@
         <result property="ticketDate" column="ticket_date"/>
         <result property="admissionTicketStatus" column="admission_ticket_status"/>
         <result property="venueName"    column="venue_name"    />
+        <result property="sort"    column="sort"    />
     </resultMap>
 
     <insert id="insertAdmissionTicketToList" parameterType="list">
         insert into beilv_admission_ticket
-        (id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status)
+        (id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status, sort)
         values
         <foreach collection="list" item="ticket" separator=",">
             (
@@ -30,12 +31,13 @@
             #{ticket.price},
             #{ticket.ticketDate},
             #{ticket.admissionTicketStatus}
+            #{ticket.sort}
             )
         </foreach>
     </insert>
 
     <sql id="selectBeilvAdmissionTicketVo">
-        select id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status
+        select id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status, sort
         from beilv_admission_ticket
     </sql>
 
@@ -43,7 +45,7 @@
         SELECT
         ts.id,
         ts.venue_id,
-        ts.site_name,
+        bs.name as site_name,
         ts.site_type,
         ts.SESSION,
         ts.price,
@@ -52,15 +54,23 @@
         ts.admission_ticket_status
         from beilv_admission_ticket ts
         left join beilv_venue bv on ts.venue_id = bv.id
+        left join beilv_site bs on ts.site_name = bs.id
         <where>
-            <if test="siteName != null and siteName != ''">and site_name = #{siteName}</if>
+            <if test="siteName != null and siteName != ''">and bs.name = #{siteName}</if>
             <if test="siteType != null and siteType != ''">and site_type = #{siteType}</if>
             <if test="ticketDate != null ">and ticket_date = #{ticketDate}</if>
-            <if test="admissionTicketStatus != null  and admissionTicketStatus != ''">and admission_ticket_status =
-                #{admissionTicketStatus}
+            <if test="admissionTicketStatus != null  and admissionTicketStatus != ''">
+                <choose>
+                    <when test="admissionTicketStatus == -1">
+                        and admission_ticket_status in ('0', '1')
+                    </when>
+                    <otherwise>
+                        and admission_ticket_status = #{admissionTicketStatus}
+                    </otherwise>
+                </choose>
             </if>
         </where>
-        order by site_name
+        order by site_name, sort
     </select>
 
     <select id="selectBeilvAdmissionTicketById" parameterType="String" resultMap="AdmissionTicketResult">
@@ -131,7 +141,7 @@
     </delete>
 
     <update id="updateTicketStatus" parameterType="list">
-        update beilv_admission_ticket set admission_ticket_status = '1'
+        update beilv_admission_ticket set admission_ticket_status = '3'
         where id in
         <foreach item="id" collection="list" open="(" close=")" separator=",">
             #{id}

qmjszx-quartz/src/main/java/beilv/quartz/task/SiteTask.java

@@ -29,11 +29,6 @@ public class SiteTask {
     @Autowired
     private IAdmissionTicketService ticketService;
 
-
-    public void abcd(){
-        System.out.println("==================================================");
-    }
-
     /**
      * 门票定时任务
      * 定时将日期下的各类型场地+时段写入到数据表中
@@ -59,7 +54,18 @@ public class SiteTask {
                 //判断场馆相同, 并且场地类型相同
                 if (session.getVenueId().equals(site.getVenueId()) && session.getSiteType().equals(site.getSiteType())) {
                     //创建门票实体
-                    AdmissionTicket admissionTicket = new AdmissionTicket(IdUtils.fastSimpleUUID(), String.valueOf(session.getVenueId()), site.getName(), session.getSiteType(), session.getSession(), session.getPrice(),writeDate,"0", session.getVenueName());
+                    AdmissionTicket admissionTicket = new AdmissionTicket(
+                            IdUtils.fastSimpleUUID(),
+                            String.valueOf(session.getVenueId()),
+                            site.getId().toString(),
+                            session.getSiteType(),
+                            session.getSession(),
+                            session.getPrice(),
+                            writeDate,
+                            "0",
+                            session.getVenueName(),
+                            session.getSort()
+                    );
                     ticketList.add(admissionTicket);
                 }
             });
@@ -69,9 +75,14 @@ public class SiteTask {
         ticketService.insertAdmissionTicketToList(ticketList);
     }
 
+    /**
+     * 定时更新门票状态
+     * 将超过当前时间的门票信息都更新为锁定状态
+     * @param millisecond
+     */
     public void updateTicketStatus(Long millisecond) {
         AdmissionTicket admissionTicket = new AdmissionTicket();
-        admissionTicket.setAdmissionTicketStatus("0");
+        admissionTicket.setAdmissionTicketStatus("-1");
 
         List<AdmissionTicket> admissionTickets = ticketService.selectBeilvAdmissionTicketList(admissionTicket);
 
@@ -107,10 +118,6 @@ public class SiteTask {
                 e.printStackTrace();
             }
         });
-
-        ids.forEach(id->{
-            System.out.println("id = " + id);
-        });
         if(!ids.isEmpty()){
             ticketService.updateTicketStatus(ids);
         }