|
|
@@ -644,15 +644,15 @@ public class LiveOrderController extends AppBaseController
|
|
|
{
|
|
|
Long orderId = param.getOrderId();
|
|
|
logger.info("开始处理支付请求, 订单号: {}, 支付类型: {}", orderId, param.getPayType());
|
|
|
-// try{
|
|
|
-// Long existPayedRecordId = orderService.isExistPayedRecord(param.getOrderId());
|
|
|
-// if (null != existPayedRecordId) {
|
|
|
-// orderService.payConfirmPayment(existPayedRecordId);
|
|
|
-// return R.error("当前订单已支付");
|
|
|
-// }
|
|
|
-// } catch(Exception ex){
|
|
|
-// log.error("校验当前订单是否存在已经支付的支付记录异常,param:{}",param,ex);
|
|
|
-// }
|
|
|
+ try{
|
|
|
+ Long existPayedRecordId = orderService.isExistPayedRecord(param.getOrderId());
|
|
|
+ if (null != existPayedRecordId) {
|
|
|
+ orderService.payConfirmPayment(existPayedRecordId);
|
|
|
+ return R.error("当前订单已支付");
|
|
|
+ }
|
|
|
+ } catch(Exception ex){
|
|
|
+ log.error("校验当前订单是否存在已经支付的支付记录异常,param:{}",param,ex);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
RLock lock = redissonClient.getLock(String.format(LOCK_KEY_PAY,orderId));
|