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

Commit 0d5f245d authored by 胡佳晨's avatar 胡佳晨

提交 如果为开启代理权限的时候 代理购票

parent f5b89a2c
...@@ -208,7 +208,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -208,7 +208,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属 int memberType; //会员状态 不需要判断会员 1判断会员逻辑 2会员专属
if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {//优先时间 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {//优先时间
if (payOrderParam.getNumber() > ticketData.getCounts()) { if (payOrderParam.getNumber() > ticketData.getCounts()) {
return ResponseDto.failure("优先购时段内,本场演出限购"+ticketData.getCounts()+"张"); return ResponseDto.failure("优先购时段内,本场演出限购" + ticketData.getCounts() + "张");
} }
int advanceCount = dataUtils.incrUseMemberCount(uid, performanceData.getPerformancesId()); int advanceCount = dataUtils.incrUseMemberCount(uid, performanceData.getPerformancesId());
if (advanceCount > 1) {//todo if (advanceCount > 1) {//todo
...@@ -558,7 +558,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -558,7 +558,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
orderTicketRelations.setLiveId(""); orderTicketRelations.setLiveId("");
KylinAgentVo agentVo = orderUtils.checkAgent(payOrderParam.getAgentId(), performanceData.getPerformancesId(), ticketData); KylinAgentVo agentVo = orderUtils.checkAgent(payOrderParam.getAgentId(), performanceData.getPerformancesId(), ticketData);
orderTicketRelations.setAgentId(payOrderParam.getAgentId()); orderTicketRelations.setAgentId(payOrderParam.getAgentId());
if (agentVo == null) { if (agentVo == null && ticketData.getIsAgent() == 1) {
orderTicketRelations.setAgentDistributions(BigDecimal.ZERO); orderTicketRelations.setAgentDistributions(BigDecimal.ZERO);
orderTicketRelations.setAgentStatus(0); orderTicketRelations.setAgentStatus(0);
orderTicketRelations.setAgentIdMaster("0"); orderTicketRelations.setAgentIdMaster("0");
...@@ -1094,7 +1094,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -1094,7 +1094,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
@Override @Override
public ResponseDto<HashMap<String,Object>> checkOrderResult(String orderId) { public ResponseDto<HashMap<String, Object>> checkOrderResult(String orderId) {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId); KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId);
if (orderTicketData == null) { if (orderTicketData == null) {
......
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