修改机票剩余数量计算方式,排除未付款用户

database/d_air.js

@@ -75,7 +75,8 @@ function flightInfo(flightId){
             (select * from flight where id = ?) as ff
             LEFT JOIN (select id,cityName from area ) as dep on dep.id = ff.departureCity
             LEFT JOIN (select id,cityName from area ) as tar on tar.id = ff.targetCity,
-            airTickets;`
+            airTickets as t 
+            where t.payState != '1' and t.payState != '4';`
     values.push(flightId,flightId)
     return mysql.pq(sql,values);
 }
@@ -90,7 +91,8 @@ function flightTicks(flightId){
     sql=`select ff.*,count(t.flightId = ? or null) as pay
             from 
             (select totalVotes from flight where id = ?) as ff,
-            airTickets as t`;
+            airTickets as t 
+            where t.payState != '1' and t.payState != '4'`;
     values.push(flightId,flightId);
     return mysql.pq(sql,values);
 }

db.md

@@ -54,7 +54,7 @@
 | id       | int     | pk | n   | id |
 | flightId | int | pk | n   | 航班id |
 | userId | int | pk | n   | 用户id |
-| payState | char | 1 | 1(创建,待支付),2(已经支付),3(进行中),4(取消) | 机票状态|
+| payState | char | 1 | 1(创建,待支付),2(已经支付),3(订单结束,航班已经到站),4(取消) | 机票状态|
 | createTime | date | now | now | 创建时间 |
 | payTime | date | null | null | 支付时间 |