From 67cf954b8b570d81d4a873f011aa7e2ada0c4152 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 16 Jun 2021 12:35:21 +0800 Subject: [PATCH] tt --- .../com/iformall/service/tt/impl/TtOrderServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java index 5c7b8eb21..6d56eea11 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java @@ -274,6 +274,9 @@ public class TtOrderServiceImpl implements TtOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public ResultData updateOrderStatus(Long orderId, WxAppinfo appInfo, WxPayAccount payAccount) { + if(appInfo == null || payAccount == null) { + return new ResultData(ErrorCode.APP_ID_NOT_FOUND); + } String lockKey = StringUtils.join(TT_ORDER_KEY,orderId, ":", "lock"); long time = System.currentTimeMillis() + 5000; String timeStr = String.valueOf(time); @@ -290,9 +293,6 @@ public class TtOrderServiceImpl implements TtOrderService { if(order.getCreateDate().before(expireDate)){ isExpire = true; } - if(appInfo == null || payAccount == null) { - return new ResultData(ErrorCode.APP_ID_NOT_FOUND); - } if(order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()){ String msg = ""; //待付款