支付回调修改

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserOrderClient.java

@@ -80,6 +80,7 @@ public class UserOrderClient extends BaseController {
             @PathVariable("payMethod") String payMethod,
             HttpServletRequest request
     ) {
+        //支付回调：openType is ORIGINAL ,paymentClient is STUDENT，payChannel is ali_app，payMethod is executePayment
         log.info("支付回调：openType is {} ,paymentClient is {}，payChannel is {}，payMethod is {}", openType, client, payChannel, payMethod);
         BaseResult<PaymentCallBack> res = paymentClient.analysisNotice(
                 OpenEnum.valueOf(openType), PaymentClientEnum.valueOf(client),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderPaymentServiceImpl.java

@@ -217,6 +217,9 @@ public class UserOrderPaymentServiceImpl extends ServiceImpl<UserOrderPaymentDao
             } else if (TradeStatusEnum.failed.equals(data.getStatus())) {//关单失败
                 paymentCloseFailedHandle(data);
             }
+        }else if (!userOrderVo.getStatus().equals(OrderStatusEnum.PAID)) {
+            //原路退还
+            orderRefundService.orderFailRefund(data, userOrderVo.getOrderNo(), "订单已超时，金额原路退回");
         }
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -359,7 +359,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         search.setStatus(OrderStatusEnum.PAYING.getCode());
         search.setEndTime(LocalDateTime.now().minusMinutes(120));
         //查询待支付中订单
-        List<UserOrderVo> payingOrderList = baseMapper.selectAllList(search);
+        List<UserOrderVo> payingOrderList = baseMapper.selectPendingList(search);
         for (UserOrderVo orderVo : payingOrderList) {
             //取消订单要获取锁，防止在轮询取消时，用户修改订单状态
             boolean b = DistributedLock.of(redissonClient)