xhxu 5 лет назад
Родитель
Сommit
67cf954b8b
1 измененных файлов: 3 добавлений и 3 удалений
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java Просмотреть файл

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


Загрузка…
Отмена
Сохранить