记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 80fca02f authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

修改 售罄文案 

merchantid = 1的账号更改为超级账号
parent 65b7a255
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 68 deletions
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @ 80fca02f
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
MIN( MIN(
DATE_SUB( DATE_SUB(
t.time_start , t.time_start ,
INTERVAL pay_countdown_minute MINUTE INTERVAL pay_countdown_minute MINUTE
) )
) AS 'time_sell' , ) AS 'time_sell' ,
MAX(t.time_end) AS 'time_stop' MAX(t.time_end) AS 'time_stop'
...@@ -198,7 +198,9 @@ ...@@ -198,7 +198,9 @@
<if test="status=='0'"> <if test="status=='0'">
AND ps.STATUS = #{status} AND ps.STATUS = #{status}
</if> </if>
AND pr.merchant_id = #{merchantId} <if test="merchantId!='1'">
AND pr.merchant_id = #{merchantId}
</if>
</where> </where>
ORDER BY ${orderItem} ${orderSc} ORDER BY ${orderItem} ${orderSc}
</select> </select>
...@@ -240,7 +242,7 @@ ...@@ -240,7 +242,7 @@
MIN( MIN(
DATE_SUB( DATE_SUB(
t.time_start , t.time_start ,
INTERVAL pay_countdown_minute MINUTE INTERVAL pay_countdown_minute MINUTE
) )
) AS 'time_sell' , ) AS 'time_sell' ,
MAX(t.time_end) AS 'time_stop' MAX(t.time_end) AS 'time_stop'
...@@ -385,72 +387,73 @@ ...@@ -385,72 +387,73 @@
<!-- 演出订单统计--> <!-- 演出订单统计-->
<select id="getPerformanceOrderStatisticalList" parameterType="java.lang.String" <select id="getPerformanceOrderStatisticalList" parameterType="java.lang.String"
resultMap="performanceOrderStatisticalDaoResult"> resultMap="performanceOrderStatisticalDaoResult">
SELECT SELECT kp.performances_id,
kp.performances_id , kt.tickets_id,
kt.tickets_id, kt.title,
kt.title, kt.price,
kt.price, kt.type,
kt.type, kt.use_start,
kt.use_start, IFNULL(kts.total_general, 0) AS 'total_general',
IFNULL(kts.total_general , 0) AS 'total_general' , IFNULL(ot.total_sale_general, 0) AS 'sale_general',
IFNULL(ot.total_sale_general , 0) AS 'sale_general' , IFNULL((kts.total_general - IFNULL(ot.total_sale_general, 0)), 0) AS 'surplus_general',
IFNULL((kts.total_general - IFNULL(ot.total_sale_general,0)),0) AS 'surplus_general', IFNULL(ot.total_sale_price, 0) AS 'total_sale_price',
IFNULL(ot.total_sale_price , 0) AS 'total_sale_price' , IFNULL(kts.total_exchange, 0) AS 'total_exchange',
IFNULL(kts.total_exchange , 0) AS 'total_exchange', IFNULL(ot.total_refund_general, 0) AS 'total_refund_general',
IFNULL(ot.total_refund_general , 0) AS 'total_refund_general', IFNULL(ot.total_refund_price, 0) AS 'total_refund_price',
IFNULL(ot.total_refund_price , 0) AS 'total_refund_price', IFNULL(ot.total_member_number, 0) AS 'total_member_number',
IFNULL(ot.total_member_number , 0) AS 'total_member_number', IFNULL(otp.total_paying_number, 1) AS 'total_paying_number',
IFNULL(otp.total_paying_number , 1) AS 'total_paying_number', IFNULL(ut.total_buy_users, 0) AS 'total_buy_users'
IFNULL(ut.total_buy_users , 0) AS 'total_buy_users' FROM (select t.performances_id, ktr.ticket_id
FROM from kylin_performances t
(select t.performances_id,ktr.ticket_id from kylin_performances t inner join kylin_ticket_time_relation kttr inner join kylin_ticket_time_relation kttr
on t.performances_id = kttr.performance_id on t.performances_id = kttr.performance_id
inner join kylin_ticket_relations ktr on kttr.times_id = ktr.times_id inner join kylin_ticket_relations ktr on kttr.times_id = ktr.times_id
where t.performances_id = ${performancesId}) AS kp where t.performances_id = ${performancesId}) AS kp
left JOIN( left JOIN(
SELECT SELECT kotr.performance_id AS 'performance_id',
kotr.performance_id AS 'performance_id', kotr.ticket_id,
kotr.ticket_id, (sum(kot.number) - sum(kot.refund_number)) AS 'total_sale_general',
(sum(kot.number)- sum(kot.refund_number)) AS 'total_sale_general' , (sum(kot.price_actual) - sum(kot.price_refund)) AS 'total_sale_price',
(sum(kot.price_actual) - sum(kot.price_refund)) AS 'total_sale_price', sum(kot.refund_number) as 'total_refund_general',
sum(kot.refund_number) as 'total_refund_general', sum(kot.price_refund) as 'total_refund_price',
sum(kot.price_refund) as 'total_refund_price', sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number
sum(case when kotr.is_member = 1 then kot.number else 0 end) total_member_number FROM kylin_order_ticket_relations kotr
FROM inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
kylin_order_ticket_relations kotr inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id WHERE 1 > 0
inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id and kotr.performance_id = ${performancesId}
WHERE 1>0 and kotr.performance_id = ${performancesId} and kots.`status` in (1, 3, 4)
and kots.`status` in(1,3,4) and kot.coupon_type ='no' and kot.coupon_type = 'no'
group by kotr.performance_id,kotr.ticket_id group by kotr.performance_id, kotr.ticket_id
) AS ot ON (ot.performance_id = kp.performances_id and ot.ticket_id = kp.ticket_id) ) AS ot ON (ot.performance_id = kp.performances_id and ot.ticket_id = kp.ticket_id)
left JOIN( left JOIN(
SELECT SELECT kotr.performance_id,
kotr.performance_id,kotr.ticket_id, kotr.ticket_id,
sum(ifnull(kot.number,0)) total_paying_number sum(ifnull(kot.number, 0)) total_paying_number
FROM FROM kylin_order_ticket_relations kotr
kylin_order_ticket_relations kotr inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id WHERE 1 > 0
WHERE 1>0 and kotr.performance_id = ${performancesId} and kotr.performance_id = ${performancesId}
and kots.`status` = 0 and kot.coupon_type ='no' and kots.`status` = 0
group by kotr.performance_id,kotr.ticket_id and kot.coupon_type = 'no'
) AS otp ON (otp.performance_id = kp.performances_id and otp.ticket_id = kp.ticket_id) group by kotr.performance_id, kotr.ticket_id
left join kylin_tickets kt on kt.tickets_id = kp.ticket_id ) AS otp ON (otp.performance_id = kp.performances_id and otp.ticket_id = kp.ticket_id)
left join kylin_ticket_status kts on kts.ticket_id = kp.ticket_id left join kylin_tickets kt on kt.tickets_id = kp.ticket_id
inner JOIN( left join kylin_ticket_status kts on kts.ticket_id = kp.ticket_id
select t.performance_id,count(t.user_id) as 'total_buy_users' from( inner JOIN(
SELECT select t.performance_id, count(t.user_id) as 'total_buy_users'
kotr.performance_id, from (
kot.user_id SELECT kotr.performance_id,
FROM kot.user_id
kylin_order_ticket_relations kotr FROM kylin_order_ticket_relations kotr
inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
WHERE kotr.performance_id = ${performancesId} and (kots.`status` = 0 OR kots.`status` = 1) WHERE kotr.performance_id = ${performancesId}
group by kotr.performance_id,kot.user_id and (kots.`status` = 0 OR kots.`status` = 1)
) t group by kotr.performance_id, kot.user_id
) AS ut ON ut.performance_id = kp.performances_id ) t
) AS ut ON ut.performance_id = kp.performances_id
</select> </select>
<select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult"> <select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult">
select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/errors.properties
View file @ 80fca02f
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
20013=已超过快递票截止时间 20013=已超过快递票截止时间
20014=快递票未填写收货地址 20014=快递票未填写收货地址
20015=入场人数量错误 20015=入场人数量错误
20016=该票种已售罄 20016=库存不足
20017=年龄不符合 20017=年龄不符合
20018=下单失败 20018=下单失败
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment