|
@@ -288,17 +288,14 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
|
|
|
}
|
|
|
//查是否超时
|
|
|
if (DateUtils.getMinDistanceOfTwoDate(order.getCreateDate(), new Date()) > 10){
|
|
|
- boolean closeFlag = false;
|
|
|
if (order.getPayMethod().equals(Constants.orderPayMethod.WX)) {
|
|
|
- closeFlag = wxPayService.payClose(order.getOrderNumber());
|
|
|
+ wxPayService.payClose(order.getOrderNumber());
|
|
|
} else if (order.getPayMethod().equals(Constants.orderPayMethod.WX_H5)) {
|
|
|
- closeFlag = wxPayH5Service.payClose(order.getOrderNumber());
|
|
|
- }
|
|
|
- if (closeFlag) {
|
|
|
- //支付宝订单关闭成功
|
|
|
- order.setPayStatus(Constants.orderPayStatus.PAY_ERROR);
|
|
|
- super.update(order);
|
|
|
+ wxPayH5Service.payClose(order.getOrderNumber());
|
|
|
}
|
|
|
+ //支付宝订单关闭成功
|
|
|
+ order.setPayStatus(Constants.orderPayStatus.PAY_ERROR);
|
|
|
+ super.update(order);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
logger.error("wxPayQuery payQuery error", e);
|