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

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

修改了 混合售详情接口 获取支付状态接口 获取购票信息接口 的500异常

parent 695ac0a1
...@@ -79,6 +79,9 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService { ...@@ -79,6 +79,9 @@ public class GoblinMixAppServiceImpl implements IGoblinMixAppService {
@Override @Override
public ResponseDto<GoblinMixAppDetailsVo> mixDetails(String mixId) { public ResponseDto<GoblinMixAppDetailsVo> mixDetails(String mixId) {
GoblinMixDetailsVo baseVo = redisUtils.getMixDetails(mixId); GoblinMixDetailsVo baseVo = redisUtils.getMixDetails(mixId);
if(baseVo==null){
return ResponseDto.failure("参数异常");
}
GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(baseVo.getStoreId()); GoblinStoreInfoVo storeInfoVo = redisUtils.getStoreInfoVo(baseVo.getStoreId());
GoblinMixAppDetailsVo vo = GoblinMixAppDetailsVo.getNew().copy(baseVo, storeInfoVo.getStoreName()); GoblinMixAppDetailsVo vo = GoblinMixAppDetailsVo.getNew().copy(baseVo, storeInfoVo.getStoreName());
int stock = 0; int stock = 0;
......
...@@ -444,7 +444,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService { ...@@ -444,7 +444,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus())); performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
PayDetailVo payDetailVo = new PayDetailVo(); PayDetailVo payDetailVo = new PayDetailVo();
if (ticketVo.getIsExpress() == 1) { if (ticketVo!=null && ticketVo.getIsExpress() == 1) {
KylinTicketExpressModuleVo expressModuleVo = dataUtils.getTEMVo(ticketsId); KylinTicketExpressModuleVo expressModuleVo = dataUtils.getTEMVo(ticketsId);
payDetailVo.setExpressModuleList(expressModuleVo == null ? null : expressModuleVo.getProduceCodeList()); payDetailVo.setExpressModuleList(expressModuleVo == null ? null : expressModuleVo.getProduceCodeList());
} else { } else {
......
...@@ -1074,12 +1074,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -1074,12 +1074,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
public ResponseDto<Integer> checkOrderResult(String orderId) { public ResponseDto<Integer> checkOrderResult(String orderId) {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId); KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(orderId);
if (!orderTicketData.getUserId().equals(uid)) {
return null;
}
if (orderTicketData == null) { if (orderTicketData == null) {
return ResponseDto.failure(ErrorMapping.get("20024")); return ResponseDto.failure(ErrorMapping.get("20024"));
} else { } else {
if (!orderTicketData.getUserId().equals(uid)) {
return null;
}
String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null); String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
SyncOrderDtoParam syncOrderDtoParam = JsonUtils.fromJson(returnCheckData, SyncOrderDtoParam.class); SyncOrderDtoParam syncOrderDtoParam = JsonUtils.fromJson(returnCheckData, SyncOrderDtoParam.class);
if (syncOrderDtoParam.getData().getStatus() == 1) { if (syncOrderDtoParam.getData().getStatus() == 1) {
......
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