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

Commit cd930d73 authored by jiangxiulong's avatar jiangxiulong

订单状态未 0 的兑换票增加

部分退款订单推送未已退款状态
parent 92969545
...@@ -393,7 +393,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -393,7 +393,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
// 部分退款是不退的,但是阶梯退票客服手动申请的现在也是部分退款,用户自己申请的现在不确定 // 部分退款是不退的,但是阶梯退票客服手动申请的现在也是部分退款,用户自己申请的现在不确定
// 取消退款的貌似没处理 其实这块应该可以不用处理退款中的,因为印象中退款那里有接入同步大麦 // 取消退款的貌似没处理 其实这块应该可以不用处理退款中的,因为印象中退款那里有接入同步大麦
// 0未支付 1已支付 2退款中 3已退款 4部分退款 // 0未支付 1已支付 2退款中 3已退款 4部分退款
if (item.getIsPayment() == 3 || item.getIsPayment() == 2) { if (item.getIsPayment() == 3 || item.getIsPayment() == 2 || item.getIsPayment() == 4) {
taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey); taobaoTicketUtils.withdrawDamaiOrder(timemId, orderTicketEntitiesKey);
refundOrderCount += 1; refundOrderCount += 1;
// 已转赠是转出去了 被退回是被别人退回了 已退回是别人给我的我给退回了 // 已转赠是转出去了 被退回是被别人退回了 已退回是别人给我的我给退回了
......
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_entities AS ote ON ote.order_id = ot.order_tickets_id
LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id LEFT JOIN kylin_ticket_status AS kys ON kys.ticket_id = otr.ticket_id
WHERE (ots.status = 1 or ots.status = 3 or ots.status = 4 or ots.status = 6) WHERE (ots.status in (1, 3, 4, 6) or ot.pay_type = 'FREE')
AND ote.ticket_id = ${ticketsId} AND ote.ticket_id = ${ticketsId}
AND ot.get_ticket_type = 'electronic' AND ot.get_ticket_type = 'electronic'
group by order_ticket_entities_id group by order_ticket_entities_id
......
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