|
|
@@ -237,7 +237,7 @@ public class OrderScheduler {
|
|
|
qqrb.setTraceno(orderNumber);// 商户流水号
|
|
|
QrcodeQueryResponseBean response2 = qrcodePay.query(qqrb);
|
|
|
String respCode = response2.getRespCode();
|
|
|
-
|
|
|
+ log.info("超时任务处理订单【{}】查询支付结果，支付通知信息：{}", orderNumber, response2);
|
|
|
// 0未支付，1支付成功，2支付失败，4退款中，5退款成功，6退款失败
|
|
|
if ("0".equals(respCode)) {
|
|
|
tbOrder.setStatus(5);
|
|
|
@@ -248,7 +248,7 @@ public class OrderScheduler {
|
|
|
payDetails.setState(PayStateEnums.PAY_SUCCESS.getStateCode());
|
|
|
payDetails.setPayTime(response2.getTransDate()+ " " + response2.getTransTime());
|
|
|
payDetails.setTradeNo(response2.getChannelOrderno());
|
|
|
- payDetails.setRemark("RHT PAY SUCCESS");
|
|
|
+ payDetails.setRemark("Scheduled RHT PAY SUCCESS");
|
|
|
payDetailsService.updateDetail(payDetails);
|
|
|
}else {
|
|
|
log.error("超时任务处理订单【{}】支付成功，但未获取到支付订单！支付通知信息：{}", orderNumber, response2);
|
|
|
@@ -263,8 +263,11 @@ public class OrderScheduler {
|
|
|
orders.add(tbOrder);
|
|
|
}
|
|
|
}
|
|
|
+ //list为空不要执行
|
|
|
+ if(!orders.isEmpty()){
|
|
|
+ orderService.updateBatchById(orders);
|
|
|
+ }
|
|
|
|
|
|
- orderService.updateBatchById(orders);
|
|
|
|
|
|
log.info("超时订单自动取消运行成功");
|
|
|
} catch (Exception e) {
|
wanxl