|
|
@@ -478,7 +478,7 @@
|
|
|
td.source_id AS sourceId,
|
|
|
td.source_name as sourceName,
|
|
|
IFNULL(tot.free_num, 0) AS freeNum,
|
|
|
- 0 AS freeCount,
|
|
|
+ CASE WHEN td.source_id IN ('2039225917977522177', '2041321150626263042','2042951563081805826') THEN COUNT(1) ELSE 0 END AS freeCount,
|
|
|
IFNULL(topay.actual_amount, 0) AS actualAmount,
|
|
|
COUNT(1) AS totalCount,
|
|
|
SUM(CASE WHEN tv.type IN ('adultPlus', 'adultTake') THEN 1 ELSE 0 END) AS adultCount,
|
|
|
@@ -486,7 +486,11 @@
|
|
|
SUM(CASE WHEN tv.type = 'with' THEN 1 ELSE 0 END) AS withCount,
|
|
|
SUM(CASE WHEN tv.type = 'leader' THEN 1 ELSE 0 END) AS leaderCount,
|
|
|
SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake') THEN 1 ELSE 0 END) AS infantCount,
|
|
|
- COUNT(1) - IFNULL(tot.free_num, 0) AS validCount
|
|
|
+ COUNT(1) - IFNULL(tot.free_num, 0) - CASE
|
|
|
+ WHEN td.source_id IN ('2039225917977522177', '2041321150626263042', '2042951563081805826')
|
|
|
+ THEN COUNT(1)
|
|
|
+ ELSE 0
|
|
|
+ END AS validCount
|
|
|
FROM trade_order td
|
|
|
INNER JOIN trade_order_user tou ON td.id = tou.order_id AND tou.deleted = 0
|
|
|
LEFT JOIN trade_detail tdl ON td.id = tdl.order_id AND tdl.deleted = 0
|
|
|
@@ -498,7 +502,7 @@
|
|
|
WHERE
|
|
|
td.deleted = 0
|
|
|
AND tv.type IS NOT NULL
|
|
|
- AND td.order_status > 0
|
|
|
+ AND td.order_status in (1, 6, 9, 10, 13, 14, 15)
|
|
|
<if test="vo.voyageId != null and vo.voyageId != ''">
|
|
|
AND td.voyage_id = #{vo.voyageId}
|
|
|
</if>
|
