close trade order

huanggang
1 parent 890f6a67
Showing 6 changed files with 42 additions and 35 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/CashierDeskController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/ICashierDeskService.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/ICashierPaymentService.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/TradeAssistantServiceImpl.java
@@ -59,8 +59,8 @@ public class CashierDeskController {
     }
     @RequestMapping("/orderClose")
-    public Message<?> orderPayment(@RequestParam("paymentId") String paymentId) {
-        cashierDeskService.closePrepayOrder(paymentId);
+    public Message<?> orderClose(@RequestParam("tradeId") String tradeId) {
+        cashierDeskService.closeTradeOrder(tradeId);
         return Message.success();
     }
@@ -29,9 +29,9 @@ public interface ICashierDeskService {
     OnlinePaymentStatus doPayment(CashierPayment payment);
     /**
-     * 关闭预支付订单
+     * 关闭交易订单
      */
-    void closePrepayOrder(String paymentId);
+    void closeTradeOrder(String tradeId);
     /**
      * 查询支付状态
@@ -105,8 +105,8 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     }
     @Override
-    public void closePrepayOrder(String paymentId) {
-        cashierPaymentService.closePrepayOrder(paymentId);
+    public void closeTradeOrder(String tradeId) {
+        cashierPaymentService.closeTradeOrder(tradeId);
     }
     @Override
@@ -31,9 +31,9 @@ public interface ICashierPaymentService {
     void notifyPaymentResponse(OnlinePaymentResponse response);
     /**
-     * 关闭预支付订单
+     * 关闭交易订单
      */
-    void closePrepayOrder(String paymentId);
+    void closeTradeOrder(String tradeId);
     /**
      * 查询交易订单状态
@@ -5,7 +5,6 @@ import com.diligrp.cashier.assistant.service.impl.SnowflakeKeyManager;
 import com.diligrp.cashier.pipeline.core.DiliCardPipeline;
 import com.diligrp.cashier.pipeline.core.OnlinePipeline;
 import com.diligrp.cashier.pipeline.core.PaymentPipeline;
-import com.diligrp.cashier.pipeline.core.WechatPipeline;
 import com.diligrp.cashier.pipeline.domain.*;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentRequest;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentResponse;
@@ -40,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -244,33 +244,43 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void closePrepayOrder(String paymentId) {
-        OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
-        if (PaymentState.isFinished(payment.getState())) {
-            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能关闭预支付订单: 无效的订单状态");
-        }
-
-        String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, payment.getTradeId());
+    public void closeTradeOrder(String tradeId) {
+        String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, tradeId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             lock.lock();
-            LocalDateTime now = LocalDateTime.now();
-//            TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
-            PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
-            // 只有在线支付通道才可以关闭支付订单，园区卡支付不支持
-            if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
-                OnlinePrepayOrder order = new OnlinePrepayOrder(paymentId, payment.getOutTradeNo());
-                onlinePipeline.closePrepayOrder(order);
-                PaymentStateDTO paymentDTO = PaymentStateDTO.builder().paymentId(payment.getPaymentId())
-                    .outTradeNo(null).outPayType(null).payerId(null).finishTime(null).state(PaymentState.FAILED)
-                    .description("人工关闭支付订单").version(payment.getVersion()).modifiedTime(now).build();
-                tradeAssistantService.proceedOnlinePayment(paymentDTO);
+            TradeOrder trade = tradeAssistantService.findByTradeId(tradeId);
+            if (TradeState.CLOSED.equalTo(trade.getState())) {
+                return;
+            }
+            if (TradeState.isFinished(trade.getState())) {
+                throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "关闭交易订单失败: 无效的订单状态");
+            }
-                // 暂时不修改交易订单，交易订单状态由延时消息统一处理，此时交易订单仍然可以继续支付
-//                TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.CLOSED, trade.getVersion(), now);
-//                tradeAssistantService.proceedTradeOrder(tradeStateDTO);
+            LocalDateTime now = LocalDateTime.now();
+            // 获取所有支付记录
+            List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(trade.getTradeId(),
+                TradeType.TRADE.getCode(), null);
+            for (OnlinePayment payment : onlinePayments) {
+                if (PaymentState.SUCCESS.equalTo(payment.getState())) {
+                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "关闭交易订单失败: 存在支付成功的记录");
+                } else if (PaymentState.PENDING.equalTo(payment.getState()) || PaymentState.PROCESSING.equalTo(payment.getState())) {
+                    PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
+                    if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                        // 理论上只存在一条支付中的支付记录，否则后面的支付通道关闭失败时，会回滚前面支付记录的状态修改
+                        OnlinePrepayOrder order = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
+                        onlinePipeline.closePrepayOrder(order);
+                        PaymentStateDTO paymentDTO = PaymentStateDTO.builder().paymentId(payment.getPaymentId())
+                            .outTradeNo(null).outPayType(null).payerId(null).finishTime(null).state(PaymentState.FAILED)
+                            .description("人工关闭支付订单").version(payment.getVersion()).modifiedTime(now).build();
+                        tradeAssistantService.proceedOnlinePayment(paymentDTO);
+                    }
+                }
             }
+
+            TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.CLOSED, trade.getVersion(), now);
+            tradeAssistantService.proceedTradeOrder(tradeStateDTO);
         } finally {
             if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
 package com.diligrp.cashier.trade.service.impl;
-import com.diligrp.cashier.pipeline.Constants;
 import com.diligrp.cashier.pipeline.core.OnlinePipeline;
 import com.diligrp.cashier.pipeline.core.PaymentPipeline;
 import com.diligrp.cashier.pipeline.domain.OnlinePrepayOrder;
@@ -65,24 +64,22 @@ public class TradeAssistantServiceImpl implements ITradeAssistantService {
         // 查询支付订单所有的支付记录, 关闭支付中的支付记录, 忽略支付失败的支付记录, 存在支付成功的支付记录时不允许继续支付
         List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(trade.getTradeId(), TradeType.TRADE.getCode(), null);
         for (OnlinePayment payment : onlinePayments) {
-            if (PaymentState.PENDING.equalTo(payment.getState()) || PaymentState.PROCESSING.equalTo(payment.getState())) {
+            if (!PaymentState.isFinished(payment.getState())) {
                 PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                    // 理论上只存在一条支付中的支付记录，否则后面的支付通道关闭失败时，会回滚前面支付记录的状态修改
                     LocalDateTime now = LocalDateTime.now();
                     PaymentStateDTO paymentStateDTO = PaymentStateDTO.builder().paymentId(payment.getPaymentId())
                         .finishTime(now).state(PaymentState.FAILED).description("主动关闭支付中的订单")
                         .version(payment.getVersion()).modifiedTime(now).build();
                     proceedOnlinePayment(paymentStateDTO);
                     OnlinePrepayOrder prepayOrder = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
-                    // 微信服务商模式下, outMchId为签约子商户; 园区卡支付时, outMchId为市场ID
-                    prepayOrder.attach(Constants.PARAM_MCH_ID, payment.getOutMchId());
                     onlinePipeline.closePrepayOrder(prepayOrder);
                 }
                 // 园区卡支付通道不会存在支付中的记录
             } else if (PaymentState.SUCCESS.equalTo(payment.getState())) {
                 return false;
             } else if (PaymentState.FAILED.equalTo(payment.getState())) {
-                continue;
             }
         }
         return true;