issue fixed after prod testing

huanggang
1 parent 9ea129ba
Showing 2 changed files with 65 additions and 54 deletions
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
@@ -17,10 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 public class CardPaymentHttpClient extends ServiceEndpointSupport {
@@ -47,6 +44,7 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
     public CardPaymentResponse sendPaymentRequest(CardPaymentRequest request) {
         String uri = String.format("%s%s", baseUri, PAYMENT_URL);
         SourceType sourceType = request.getObject("source", SourceType.class);
+        String attach = request.getString("attach");
         Map<String, Object> params = new LinkedHashMap<>();
         params.put("mchId", outMchId); // 市场ID
         params.put("accountId", accountId); // 市场ID
@@ -58,10 +56,13 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         params.put("outTradeNo", request.getPaymentId());
         params.put("goodsDesc", request.getGoods());
         params.put("description", request.getDescription());
-        if (sourceType != null) {
+        if (Objects.nonNull(sourceType)) {
             params.put("sourceId", sourceType.getCode());
             params.put("sourceName", sourceType.getName());
         }
+        if (Objects.nonNull(attach)) {
+            params.put("attach", attach);
+        }
         String payload = JsonUtils.toJsonString(params);
         LOG.info("Sending card payment request: {}\n{}", request.getPaymentId(), payload);
@@ -178,6 +178,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                     CardPaymentRequest request = new CardPaymentConverter(trade, paymentId, now).convert(payment);
                     // 园区卡支付需要订单来源
                     request.attach("source", SourceType.getIfNonNull(trade.getSource()));
+                    request.attach("attach", trade.getAttach());
                     // 修改支付状态为支付中，防止重复支付
                     CardPaymentResponse response = cardPipeline.sendPaymentRequest(request);
                     // 支付成功插入支付记录并修改交易订单状态，失败可以继续支付
@@ -339,59 +340,68 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public OnlineRefundResult sendRefundRequest(OnlineRefundDTO request) {
-        TradeOrder trade = tradeAssistantService.findByTradeId(request.getTradeId());
-        if (!TradeState.forRefund(trade.getState())) {
-            throw new TradePaymentException(ErrorCode.INVALID_OBJECT_STATE, "不能进行交易退款: 无效的交易状态");
-        }
-        if (trade.getAmount() < request.getAmount()) {
-            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "申请退费金额超过原支付金额");
-        }
-        // 理论上只会存在一条支付完成的支付订单
-        OnlinePayment payment = onlinePaymentDao.listOnlinePayments(trade.getTradeId(),
-            TradeType.TRADE.getCode(), PaymentState.SUCCESS.getCode()).stream().findFirst()
-            .orElseThrow(() -> new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行交易退款: 无支付信息"));
-
-        LOG.info("Requesting cashier payment refund: {}", request.getTradeId());
-        LocalDateTime now = LocalDateTime.now().withNano(0);
-        KeyGenerator refundIdKey = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID);
-        String refundId = refundIdKey.nextId();
-        PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
-        OnlineRefundRequest refundRequest = OnlineRefundRequest.of(refundId, payment.getPaymentId(), payment.getOutTradeNo(),
-            trade.getMaxAmount(), request.getAmount(), request.getDescription(), now);
-        OnlineRefundResponse response;
-        if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
-            response = onlinePipeline.sendRefundRequest(refundRequest);
-        } else if (pipeline instanceof DiliCardPipeline cardPipeline) {
-            response = cardPipeline.sendRefundRequest(refundRequest);
-        } else {
-            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不支持的支付通道");
-        }
+        String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, request.getTradeId());
+        RLock lock = redissonClient.getLock(lockKey);
+        try {
+            lock.lock();
+            TradeOrder trade = tradeAssistantService.findByTradeId(request.getTradeId());
+            if (!TradeState.forRefund(trade.getState())) {
+                throw new TradePaymentException(ErrorCode.INVALID_OBJECT_STATE, "不能进行交易退款: 无效的交易状态");
+            }
+            if (trade.getAmount() < request.getAmount()) {
+                throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "申请退费金额超过原支付金额");
+            }
+            // 理论上只会存在一条支付完成的支付订单
+            OnlinePayment payment = onlinePaymentDao.listOnlinePayments(trade.getTradeId(),
+                TradeType.TRADE.getCode(), PaymentState.SUCCESS.getCode()).stream().findFirst()
+                .orElseThrow(() -> new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行交易退款: 无支付信息"));
+
+            LOG.info("Requesting cashier payment refund: {}", request.getTradeId());
+            LocalDateTime now = LocalDateTime.now().withNano(0);
+            KeyGenerator refundIdKey = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID);
+            String refundId = refundIdKey.nextId();
+            PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
+            OnlineRefundRequest refundRequest = OnlineRefundRequest.of(refundId, payment.getPaymentId(), payment.getOutTradeNo(),
+                trade.getMaxAmount(), request.getAmount(), request.getDescription(), now);
+            OnlineRefundResponse response;
+            if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                response = onlinePipeline.sendRefundRequest(refundRequest);
+            } else if (pipeline instanceof DiliCardPipeline cardPipeline) {
+                response = cardPipeline.sendRefundRequest(refundRequest);
+            } else {
+                throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不支持的支付通道");
+            }
-        LOG.debug("Cashier payment refund result: [{}:{}]", trade.getTradeId(), response.getState().name());
-        OnlinePayment refund = OnlinePayment.builder().outMchId(payment.getOutMchId()).tradeId(payment.getTradeId())
-            .type(TradeType.REFUND).paymentId(refundId).channelId(payment.getChannelId())
-            .payType(payment.getPayType()).pipelineId(payment.getPipelineId()).goods(payment.getGoods() + "-退款")
-            .amount(request.getAmount()).objectId(payment.getPaymentId()).payerId(payment.getPayerId())
-            .outTradeNo(response.getOutTradeNo()).outPayType(payment.getOutPayType()).finishTime(response.getWhen())
-            .state(response.getState()).notifyUrl(request.getNotifyUrl()).description(request.getDescription())
-            .version(0).createdTime(now).modifiedTime(now).build();
-        onlinePaymentDao.insertOnlinePayment(refund);
+            LOG.debug("Cashier payment refund result: [{}:{}]", trade.getTradeId(), response.getState().name());
+            OnlinePayment refund = OnlinePayment.builder().outMchId(payment.getOutMchId()).tradeId(payment.getTradeId())
+                .type(TradeType.REFUND).paymentId(refundId).channelId(payment.getChannelId())
+                .payType(payment.getPayType()).pipelineId(payment.getPipelineId()).goods(payment.getGoods() + "-退款")
+                .amount(request.getAmount()).objectId(payment.getPaymentId()).payerId(payment.getPayerId())
+                .outTradeNo(response.getOutTradeNo()).outPayType(payment.getOutPayType()).finishTime(response.getWhen())
+                .state(response.getState()).notifyUrl(request.getNotifyUrl()).description(request.getDescription())
+                .version(0).createdTime(now).modifiedTime(now).build();
+            onlinePaymentDao.insertOnlinePayment(refund);
+
+            if (response.getState() == PaymentState.SUCCESS) {
+                Long newAmount = trade.getAmount() - refund.getAmount();
+                TradeStateDTO tradeState = TradeStateDTO.of(trade.getTradeId(), newAmount, TradeState.REFUND, trade.getVersion(), now);
+                tradeAssistantService.proceedTradeOrder(tradeState);
+            } else if (!PaymentState.isFinished(response.getState().getCode())) {
+                // 固定周期后，查询退款状态，根据状态完成退款订单
+                if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 只有在线支付通道允许查询退款状态
+                    Duration duration = onlinePipeline.getTimeStrategy().nextRefundScanTime(1);
+                    TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
+                    taskMessageSender.sendDelayTaskMessage(message, duration);
+                }
+            }
-        if (response.getState() == PaymentState.SUCCESS) {
-            Long newAmount = trade.getAmount() - refund.getAmount();
-            TradeStateDTO tradeState = TradeStateDTO.of(trade.getTradeId(), newAmount, TradeState.REFUND, trade.getVersion(), now);
-            tradeAssistantService.proceedTradeOrder(tradeState);
-        } else if (!PaymentState.isFinished(response.getState().getCode())) {
-            // 固定周期后，查询退款状态，根据状态完成退款订单
-            if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 只有在线支付通道允许查询退款状态
-                Duration duration = onlinePipeline.getTimeStrategy().nextRefundScanTime(1);
-                TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
-                taskMessageSender.sendDelayTaskMessage(message, duration);
+            return new OnlineRefundResult(refundId, payment.getPaymentId(), response.getState().getCode(),
+                response.getWhen(), response.getMessage());
+        } finally {
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
             }
         }
-
-        return new OnlineRefundResult(refundId, payment.getPaymentId(), response.getState().getCode(),
-            response.getWhen(), response.getMessage());
     }
     @Override