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

Commit 7adcf50f authored by 胡佳晨's avatar 胡佳晨

修改 同步大麦

parent aecfc8de
...@@ -117,9 +117,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -117,9 +117,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
@Override @Override
public OrderDetailsVo orderDetails(String orderId) { public OrderDetailsVo orderDetails(String orderId) {
Long currentTime = System.currentTimeMillis();
OrderDetailsVo vo = OrderDetailsVo.getNew();
try { try {
Long currentTime = System.currentTimeMillis();
OrderDetailsVo vo = OrderDetailsVo.getNew();
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
// checkOrderTime(uid); // checkOrderTime(uid);
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId); KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
...@@ -156,9 +156,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -156,9 +156,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderTicketVo.setFieldName(performanceVo.getFieldName()); orderTicketVo.setFieldName(performanceVo.getFieldName());
List<KylinOrderRefundsVo> orderRefundsVoList; List<KylinOrderRefundsVo> orderRefundsVoList;
log.info("getQrCode:" +orderTicketVo.getQrCode()); log.info("getQrCode:" + orderTicketVo.getQrCode());
if (orderTicketVo.getQrCode().equalsIgnoreCase("")) { if (orderTicketVo.getQrCode().equalsIgnoreCase("")) {
log.info("getQrCode:" +orderTicketVo.getQrCode()); log.info("getQrCode:" + orderTicketVo.getQrCode());
orderRefundsVoList = new ArrayList<>(); orderRefundsVoList = new ArrayList<>();
} else { } else {
orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId); orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderId);
...@@ -250,8 +250,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -250,8 +250,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
log.info(UserPathDto.setData("订单详情", orderId, vo)); log.info(UserPathDto.setData("订单详情", orderId, vo));
return vo; return vo;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); log.info("DETAIL ERROR = ",e);
return vo; return null;
} }
} }
......
...@@ -599,10 +599,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -599,10 +599,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
//检查订单时间 是否关闭 //检查订单时间 是否关闭
KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(payAgainParam.getOrderId()); KylinOrderTicketVo orderTicketData = dataUtils.getOrderTicketVo(payAgainParam.getOrderId());
log.info("data uid = "+orderTicketData.getUserId());
log.info("param uid = "+uid); log.info("param uid = "+uid);
log.info("param data = "+orderTicketData);
if (!orderTicketData.getUserId().equals(uid)) { if (!orderTicketData.getUserId().equals(uid)) {
log.info("data uid = "+orderTicketData.getUserId());
log.info("param uid = "+uid);
return ResponseDto.failure(ErrorMapping.get("20003")); return ResponseDto.failure(ErrorMapping.get("20003"));
} }
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