upgrade after testing

huanggang
1 parent 3ab3cdfd
Showing 3 changed files with 25 additions and 63 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderVO.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierAssistantServiceImpl.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
@@ -35,7 +35,7 @@ public class CashierOrderVO {
         private final Long pipelineId;
         // 支付渠道
         private final Integer channelId;
-
+        // 支付渠道名称
         private final String channelName;
         public PaymentPipeline(Long pipelineId, ChannelType channelType) {
@@ -65,7 +65,6 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
                     OnlinePrepayOrder order = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
                     // 微信服务商模式，还需子商户
-                    order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
                     OnlinePaymentResponse response = onlinePipeline.queryPrepayResponse(order);
                     if (!PaymentState.isFinished(response.getState().getCode())) {
                         try {
@@ -105,8 +104,6 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
         OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), OnlinePipeline.class);
         OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
-        // 微信服务商模式，还需子商户
-        order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, refund.getOutMchId());
         OnlineRefundResponse response = pipeline.queryRefundResponse(order);
         cashierPaymentService.notifyRefundResult(response);
     }
@@ -139,7 +139,6 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                     // 小程序收银台将使用在线支付通道的小程序支付
                     MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(cashierPayment);
                     MiniProPrepayResponse response = onlinePipeline.sendMiniProPrepayRequest(request);
-                    // 微信服务商模式下outMchId为签约子商户
                     String outMchId = request.getString(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID);
                     OnlinePayment payment = OnlinePayment.builder().outMchId(outMchId).tradeId(trade.getTradeId())
                         .type(TradeType.TRADE).paymentId(paymentId).channelId(onlinePipeline.supportedChannel())
@@ -210,6 +209,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         if (PaymentState.isFinished(response.getState().getCode())) {
             LocalDateTime now = LocalDateTime.now();
+            OnlinePaymentResult paymentResult = null;
             String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, payment.getTradeId());
             RLock lock = redissonClient.getLock(lockKey);
             try {
@@ -225,17 +225,20 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 if (PaymentState.SUCCESS == response.getState() && TradeState.PENDING.equalTo(trade.getState())) {
                     TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.SUCCESS, trade.getVersion(), now);
                     tradeAssistantService.proceedTradeOrder(tradeStateDTO);
-                    LOG.debug("Accomplish cashier order[{}] successfully", trade.getTradeId());
-                    OnlinePaymentResult paymentResult = OnlinePaymentResult.of(trade.getTradeId(), payment.getPaymentId(),
+                    LOG.debug("Accomplish cashier trade order[{}] successfully", trade.getTradeId());
+                    paymentResult = OnlinePaymentResult.of(trade.getTradeId(), payment.getPaymentId(),
                         response.getState(), trade.getOutTradeNo(), response.getOutPayType(), response.getPayerId(),
-                        response.getWhen() != null ? response.getWhen() : now, response.getMessage());
-                    paymentResultManager.notifyPaymentResult(trade.getNotifyUrl(), paymentResult, 500);
+                        response.getWhen(), response.getMessage());
                 }
             } finally {
                 if (lock.isHeldByCurrentThread()) {
                     lock.unlock();
                 }
             }
+            // 在分布式锁外支付回调
+            if (paymentResult != null) {
+                paymentResultManager.notifyPaymentResult(payment.getNotifyUrl(), paymentResult, 500);
+            }
         }
     }
@@ -253,21 +256,20 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             lock.lock();
             LocalDateTime now = LocalDateTime.now();
-            TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
+//            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());
-                // 用于微信服务商模式下，微信子商户信息
-                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
                 onlinePipeline.closePrepayOrder(order);
                 PaymentStateDTO paymentDTO = PaymentStateDTO.builder().paymentId(payment.getPaymentId())
-                    .outTradeNo(null).outPayType(null).payerId(null).finishTime(now).state(PaymentState.FAILED)
+                    .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);
+                // 暂时不修改交易订单，交易订单状态由延时消息统一处理，此时交易订单仍然可以继续支付
+//                TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.CLOSED, trade.getVersion(), now);
+//                tradeAssistantService.proceedTradeOrder(tradeStateDTO);
             }
         } finally {
             if (lock.isHeldByCurrentThread()) {
@@ -287,14 +289,10 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             OnlinePrepayOrder order = new OnlinePrepayOrder(paymentId, payment.getOutTradeNo());
             PaymentPipeline<?> paymentPipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
             if (paymentPipeline instanceof OnlinePipeline<?> pipeline) {
-                // 用于微信服务商模式下，微信子商户信息
-                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
                 OnlinePaymentResponse response = pipeline.queryPrepayResponse(order);
                 return OnlinePaymentResult.of(trade.getTradeId(), paymentId, response.getState(), trade.getOutTradeNo(),
                     response.getOutPayType(), response.getPayerId(), response.getWhen(), response.getMessage());
             } else if (paymentPipeline instanceof DiliCardPipeline pipeline) {
-                // 园区卡支付outMchId为市场ID
-                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
                 CardPaymentResponse response = pipeline.queryPaymentResponse(order);
                 return OnlinePaymentResult.of(trade.getTradeId(), paymentId, response.getState(), trade.getOutTradeNo(),
                     response.getOutPayType(), response.getPayerId(), response.getWhen(), response.getMessage());
@@ -302,39 +300,6 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         }
         return new OnlinePaymentResult(trade.getTradeId(), paymentId, payment.getState(), trade.getOutTradeNo(),
             payment.getOutPayType(), payment.getPayerId(), payment.getFinishTime(), payment.getDescription());
-        /*LOG.debug("Query online trade order[{}] state...", tradeId);
-        TradeOrder trade = tradeAssistantService.findByTradeId(tradeId);
-        List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(tradeId, TradeType.TRADE.getCode());
-        if (TradeState.SUCCESS.equalTo(trade.getState()) || TradeState.REFUND.equalTo(trade.getState())) {
-            OnlinePayment payment = onlinePayments.stream().filter(p -> PaymentState.SUCCESS.equalTo(p.getState()))
-                .findFirst().orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "未找到支付订单"));
-            return new OnlinePaymentResult(tradeId, payment.getState(), trade.getOutTradeNo(), payment.getOutPayType(),
-                    payment.getPayerId(), payment.getFinishTime(), payment.getDescription());
-        } else if (TradeState.FAILED.equalTo(trade.getState()) || TradeState.CLOSED.equalTo(trade.getState())) {
-            return OnlinePaymentResult.of(tradeId, PaymentState.FAILED, trade.getOutTradeNo(),
-                    null, null, LocalDateTime.now(), "等待支付");
-        } else { // 交易订单等待支付
-            // 查找交易订单中正在支付中的支付记录
-            OnlinePayment payment = onlinePayments.stream().filter(p -> PaymentState.PROCESSING.equalTo(p.getState()))
-                .findFirst().orElse(null);
-            if (payment == null) { // 交易订单没有支付记录
-                return OnlinePaymentResult.of(tradeId, PaymentState.PENDING, trade.getOutTradeNo(),
-                        null, null, LocalDateTime.now(), "等待支付");
-            }
-            if ("online".equalsIgnoreCase(mode)) {
-                OnlinePrepayOrder order = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
-                OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), OnlinePipeline.class);
-                // 用于微信服务商模式下，微信子商户信息
-                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
-                OnlinePaymentResponse response = pipeline.queryPrepayResponse(order);
-                return OnlinePaymentResult.of(tradeId, response.getState(), trade.getOutTradeNo(),
-                    response.getOutPayType(), response.getPayerId(), response.getWhen(), response.getMessage());
-            } else {
-                return new OnlinePaymentResult(tradeId, payment.getState(), trade.getOutTradeNo(), payment.getOutPayType(),
-                    payment.getPayerId(), payment.getFinishTime(), payment.getDescription());
-            }
-
-        }*/
     }
     @Override
@@ -358,8 +323,6 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
         OnlineRefundRequest refundRequest = OnlineRefundRequest.of(refundId, payment.getPaymentId(), payment.getOutTradeNo(),
             trade.getMaxAmount(), request.getAmount(), request.getDescription(), now);
-        // 微信支付外部商户号为微信商户号或特约子商户; 园区卡支付外部商户号为市场ID
-        refundRequest.put(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
         OnlineRefundResponse response;
         if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
             response = onlinePipeline.sendRefundRequest(refundRequest);
@@ -381,6 +344,8 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             Long newAmount = trade.getAmount() - refund.getAmount();
             TradeStateDTO tradeState = TradeStateDTO.of(trade.getTradeId(), newAmount, TradeState.REFUND, trade.getVersion(), now);
             tradeAssistantService.proceedTradeOrder(tradeState);
+            xx
+            // TODO:
         } else if (!PaymentState.isFinished(response.getState())) {
             // 固定周期后，查询退款状态，根据状态完成退款订单
             TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
@@ -395,14 +360,14 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     public void notifyRefundResult(OnlineRefundResponse response) {
         OnlinePayment refund = tradeAssistantService.findByRefundId(response.getRefundId());
         if (PaymentState.isFinished(refund.getState())) {
-            LOG.warn("Duplicate process online refund order notification for {}:{}", response.getRefundId(), response.getState());
+            LOG.warn("Duplicate process online refund order[{}:{}]", response.getRefundId(), response.getState());
             return;
         }
         if (!PaymentState.isFinished(response.getState())) {
-            LOG.warn("Ignore online refund order notification for {}:{}", response.getRefundId(), response.getState());
+            LOG.warn("Ignore online refund order[{}:{}]", response.getRefundId(), response.getState());
             return;
         }
-        LOG.info("Processing online refund order notification for {}:{}", response.getRefundId(), response.getState());
+        LOG.info("Processing online refund order[{}:{}]", response.getRefundId(), response.getState());
         LocalDateTime now = LocalDateTime.now();
         TradeOrder trade = tradeAssistantService.findByTradeId(refund.getTradeId());
@@ -429,12 +394,12 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         LOG.debug("Query online refund order[{}-{}] state...", refundId, refund.getState());
         // 微信支付通知较为及时和安全，非特殊情况可使用offline模式；一些本地状态与微信状态不一致的"异常订单"可使用online模式同步状态
         if (!PaymentState.isFinished(refund.getState()) && "online".equalsIgnoreCase(mode)) {
-            WechatPipeline<?> pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), WechatPipeline.class);
-            OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
-            // 用于微信服务商模式下，微信子商户信息
-            order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, refund.getOutMchId());
-            OnlineRefundResponse response = pipeline.queryRefundResponse(order);
-            return new OnlineRefundResult(refundId, refund.getObjectId(), response.getState(), response.getWhen(), response.getMessage());
+            PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), PaymentPipeline.class);
+            if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
+                OnlineRefundResponse response = onlinePipeline.queryRefundResponse(order);
+                return new OnlineRefundResult(refundId, refund.getObjectId(), response.getState(), response.getWhen(), response.getMessage());
+            }
         }
         return new OnlineRefundResult(refundId, refund.getObjectId(), refund.getState(), refund.getFinishTime(), refund.getDescription());
     }