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

Commit 75ce3c60 authored by 胡佳晨's avatar 胡佳晨

KylinDamaiServiceImpl.java 删除 010 020后缀

KylinOrderTicketsServiceImpl.java
订单支付回调增加 实时同步
订单支付回调增加 超时支付退款关闭订单
TaobaoTicketUtils.java 增加 大麦订单退款
KylinRefundsStatusServiceImpl.java 增加 财务通过 大麦同步
KylinOrderTicketsServiceImpl.java 增加新接口 放开订单列表

同步大麦增加 票种同步双份(登登登VIP/非登登登VIP)
parent 24db6cd3
...@@ -218,7 +218,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -218,7 +218,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
obj12.setPerformId(timemId); obj12.setPerformId(timemId);
obj12.setSupplierSecret(taobaoTicketUtils.getSupplierSecret()); obj12.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
obj12.setSystemId(taobaoTicketUtils.getSystemId()); obj12.setSystemId(taobaoTicketUtils.getSystemId());
req.setPushItemParam(obj12); req2.setPushItemParam(obj12);
log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + "-登登登VIP 大麦票种id =" + ticketIdKey + " 票种价格 = " + ticketsData.getPrice()); log.info("[同步票种] 票种名称 = " + ticketsData.getTitle() + "-登登登VIP 大麦票种id =" + ticketIdKey + " 票种价格 = " + ticketsData.getPrice());
AlibabaDamaiMevOpenPushitemResponse rsp2 = client2.execute(req2); AlibabaDamaiMevOpenPushitemResponse rsp2 = client2.execute(req2);
if (rsp2.getResult().getSuccess()) { if (rsp2.getResult().getSuccess()) {
...@@ -255,10 +255,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -255,10 +255,8 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
long orderTicketEntitiesKey; long orderTicketEntitiesKey;
if (item.getIsMember() == 1) { if (item.getIsMember() == 1) {
orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010")); orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("010"));
} else { } else {
orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020")); orderTicketEntitiesKey = Long.valueOf(IDGenerator.getDamaiCode(item.getOrderTicketEntitiesId()).toString().concat("020"));
obj3.setExt("");
} }
long orderIdKey = IDGenerator.getDamaiCode(item.getOrderTicketsId()); long orderIdKey = IDGenerator.getDamaiCode(item.getOrderTicketsId());
...@@ -284,7 +282,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl ...@@ -284,7 +282,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
obj3.setExt("登登登VIP"); obj3.setExt("登登登VIP");
obj3.setTicketItemId(ticketsmId); obj3.setTicketItemId(ticketsmId);
} }
obj3.setQrCode(IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId())); obj3.setQrCode("http://m.zhengzai.tv?c="+IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId()));
obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
obj3.setOrderId(orderIdKey);//订单id orderId obj3.setOrderId(orderIdKey);//订单id orderId
obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子 obj3.setMediumType(item.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
......
...@@ -1121,7 +1121,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -1121,7 +1121,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
obj3.setPerformId(ticketTimesKey);//场次id obj3.setPerformId(ticketTimesKey);//场次id
obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id obj3.setVoucherId(orderTicketEntitiesKey);//票单号 入场人id
obj3.setQrCode(IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId())); obj3.setQrCode("http://m.zhengzai.tv?c="+IDGenerator.ticketQrCode(item.getOrderTicketEntitiesId()));
obj3.setOrderId(orderIdKey);//订单id orderId obj3.setOrderId(orderIdKey);//订单id orderId
obj3.setMediumType(orderData.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子 obj3.setMediumType(orderData.getGetTicketType().equals("express") ? 1L : 2L);//票类型 快递 电子
obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret()); obj3.setSupplierSecret(taobaoTicketUtils.getSupplierSecret());
......
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