|
|
|
@@ -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 = ""; |
|
|
|
//待付款 |
|
|
|
|