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

Commit 4a69689b authored by 胡佳晨's avatar 胡佳晨

修改 下单逻辑

parent 00b79e38
...@@ -313,9 +313,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -313,9 +313,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return resultData; return resultData;
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
log.error("Kylin Order Pay Error = " + e.getMessage());
} finally {
if (isDownGeneral) { if (isDownGeneral) {
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber()); dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
...@@ -330,7 +327,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -330,7 +327,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
} }
} }
} }
// redisLockUtil.unlock(lock); e.printStackTrace();
log.error("Kylin Order Pay Error = " + e.getMessage());
return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
} }
} }
...@@ -552,7 +550,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -552,7 +550,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
String returnData = HttpUtil.post(payUrl + payOrderParam.getDeviceFrom() + "/" + payOrderParam.getPayType(), httpData); String returnData = HttpUtil.post(payUrl + payOrderParam.getDeviceFrom() + "/" + payOrderParam.getPayType(), httpData);
log.debug("NOTIFY_URL = "+synUrl); log.debug("NOTIFY_URL = " + synUrl);
currentTime = System.currentTimeMillis() - currentTime; currentTime = System.currentTimeMillis() - currentTime;
log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒"); log.debug("调用 PHP 支付 -> time:" + (currentTime) + "毫秒");
PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class); PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
...@@ -710,7 +708,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -710,7 +708,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
@Override @Override
public String syncOrder(SyncOrderParam syncOrderParam) { public String syncOrder(SyncOrderParam syncOrderParam) {
try { try {
log.debug("SYNC PARAM = "+syncOrderParam.toString()); log.debug("SYNC PARAM = " + syncOrderParam.toString());
//支付时间 //支付时间
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
String lock = "order_lock:" + syncOrderParam.getOrder_code(); String lock = "order_lock:" + syncOrderParam.getOrder_code();
...@@ -859,7 +857,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -859,7 +857,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, "")); log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
return "success"; return "success";
} catch (Exception e) { } catch (Exception e) {
log.error("SYNCE ORDER E = "+e.getMessage()); log.error("SYNCE ORDER E = " + e.getMessage());
e.printStackTrace(); e.printStackTrace();
return "fail"; return "fail";
} }
......
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