| @@ -274,6 +274,9 @@ public class TtOrderServiceImpl implements TtOrderService { | |||||
| @Override | @Override | ||||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | ||||
| public ResultData updateOrderStatus(Long orderId, WxAppinfo appInfo, WxPayAccount payAccount) { | 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"); | String lockKey = StringUtils.join(TT_ORDER_KEY,orderId, ":", "lock"); | ||||
| long time = System.currentTimeMillis() + 5000; | long time = System.currentTimeMillis() + 5000; | ||||
| String timeStr = String.valueOf(time); | String timeStr = String.valueOf(time); | ||||
| @@ -290,9 +293,6 @@ public class TtOrderServiceImpl implements TtOrderService { | |||||
| if(order.getCreateDate().before(expireDate)){ | if(order.getCreateDate().before(expireDate)){ | ||||
| isExpire = true; | isExpire = true; | ||||
| } | } | ||||
| if(appInfo == null || payAccount == null) { | |||||
| return new ResultData(ErrorCode.APP_ID_NOT_FOUND); | |||||
| } | |||||
| if(order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()){ | if(order.getOrderStatus() == EnumTtOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()){ | ||||
| String msg = ""; | String msg = ""; | ||||
| //待付款 | //待付款 | ||||