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

Commit 868061a3 authored by 胡佳晨's avatar 胡佳晨

缺票登记 提交

parent 645d0266
...@@ -153,8 +153,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -153,8 +153,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
String timeStart = ticketData.getTimeStart(); // 普通开售时间 String timeStart = ticketData.getTimeStart(); // 普通开售时间
String timeEnd = ticketData.getTimeEnd(); // 购票停售时间 String timeEnd = ticketData.getTimeEnd(); // 购票停售时间
String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间 String timeExpressEnd = ticketData.getTimeEndExpress(); // 快递停售时间
// boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员 boolean isMember = feignAdamBaseClient.isMember(uid).getData();//获取是否是会员
boolean isMember = true; // boolean isMember = true;
int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属 int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
if (ticketData.getIsExclusive() == 1) { if (ticketData.getIsExclusive() == 1) {
memberType = 2; memberType = 2;
...@@ -290,10 +290,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -290,10 +290,10 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
orderTickets.setOrderTicketsId(orderTicketId); orderTickets.setOrderTicketsId(orderTicketId);
orderTickets.setUserId(uid); orderTickets.setUserId(uid);
Map token = CurrentUtil.getTokenClaims(); Map token = CurrentUtil.getTokenClaims();
// orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), "")); orderTickets.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
// orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), "")); orderTickets.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
orderTickets.setUserName(""); // orderTickets.setUserName("");
orderTickets.setUserMobile(""); // orderTickets.setUserMobile("");
orderTickets.setPerformanceTitle(performanceData.getTitle()); orderTickets.setPerformanceTitle(performanceData.getTitle());
orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId)); orderTickets.setOrderCode(IDGenerator.ticketOrderCode(orderTicketId));
orderTickets.setPayCode(""); orderTickets.setPayCode("");
...@@ -492,7 +492,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -492,7 +492,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
LinkedList<Object[]> sqlsDataA = new LinkedList<Object[]>(); LinkedList<Object[]> sqlsDataA = new LinkedList<Object[]>();
sqlsDataA.add(orderTickets.getAddObject()); sqlsDataA.add(orderTickets.getAddObject());
//少mq
if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) { if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
payResultVo.setShowUrl(payOrderParam.getShowUrl()); payResultVo.setShowUrl(payOrderParam.getShowUrl());
payResultVo.setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId); payResultVo.setReturnUrl(payOrderParam.getReturnUrl() + orderTicketId);
...@@ -842,6 +841,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -842,6 +841,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
@Override @Override
public boolean checkOrderTime(String userId) { public boolean checkOrderTime(String userId) {
List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId); List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
LinkedList<String> sqls = new LinkedList<>();
for (OrderScriptDto item : dtoData) { for (OrderScriptDto item : dtoData) {
if (!RedisLockUtil.tryLock("order_lock:" + item.getOrderCode(), 30, 240)) { if (!RedisLockUtil.tryLock("order_lock:" + item.getOrderCode(), 30, 240)) {
...@@ -879,10 +879,16 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM ...@@ -879,10 +879,16 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1); dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
} }
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL, //TODO MQ代操作
SqlMapping.get("kylin_order_ticket.close", orderTickets.getCloseOrderObject())); sqls.add(SqlMapping.get("kylin_order_ticket.close"));
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL, LinkedList<Object[]> sqlsDataA = new LinkedList<>();
SqlMapping.get("kylin_order_ticket_status.close", orderTicketStatus.getCloseOrderObject())); sqlsDataA.add(orderTickets.getCloseOrderObject());
sqls.add(SqlMapping.get("kylin_order_ticket_status.close"));
LinkedList<Object[]> sqlsDataB = new LinkedList<>();
sqlsDataA.add(orderTickets.getCloseOrderObject());
rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL, SqlMapping.gets(sqls,sqlsDataA,sqlsDataB));
} catch (Exception e) { } catch (Exception e) {
lock.unlock(); lock.unlock();
......
...@@ -17,4 +17,4 @@ kylin_order_ticket.synPay=UPDATE kylin_order_tickets SET payment_type = ? ,pay_ ...@@ -17,4 +17,4 @@ kylin_order_ticket.synPay=UPDATE kylin_order_tickets SET payment_type = ? ,pay_
kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ?
# ---------------------------------------------------- # ----------------------------------------------------
kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id` ,`performance_id` ,`ticket_id` ,`user_id` ,`user_name` ,`user_mobile` ,`send_status` ,`ip_address` ,`created_at` ,)VALUES(? ,? ,? ,? ,? ,? ,? ,? ,?); kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id` ,`performance_id` ,`ticket_id` ,`user_id` ,`user_name` ,`user_mobile` ,`send_status` ,`ip_address` ,`created_at`)VALUES(? ,? ,? ,? ,? ,? ,? ,? ,?);
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