refund result issue fixed

huanggang
1 parent 95109117
Showing 3 changed files with 14 additions and 6 deletions
cashier-trade/src/main/java/com/diligrp/cashier/trade/manager/PaymentResultManager.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/manager/TaskMessageSender.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
@@ -76,6 +76,7 @@ public class PaymentResultManager {
      * 通知业务系统退款处理结果
      */
     public void notifyRefundResult(String uri, OnlineRefundResult refundResult) {
+        LOG.info("Notifying online payment result: {}, {}", refundResult.getTradeId(), refundResult.getRefundId());
         ThreadPoolService.getIoThreadPoll().submit(() -> {
             List<IPaymentEventListener> lifeCycles = eventListeners.stream().toList();
             if (!lifeCycles.isEmpty()) {
@@ -47,10 +47,10 @@ public class TaskMessageSender {
                 properties.setHeader("x-delay", String.valueOf(delayInMillis));
                 String payload = JsonUtils.toJsonString(task);
                 Message message = new Message(payload.getBytes(StandardCharsets.UTF_8), properties);
-                LOG.info("Sending async delay task message for {}", task.getPayload());
+                LOG.info("Sending async delay task message: {}", task.getPayload());
                 rabbitTemplate.send(Constants.PAYMENT_DELAY_EXCHANGE, Constants.PAYMENT_DELAY_KEY, message);
             } catch (Exception ex) {
-                LOG.error("Failed to send async delay task message for {}", task.getPayload(), ex);
+                LOG.error("Failed to send async delay task message: {}", task.getPayload(), ex);
             }
         });
     }
@@ -14,6 +14,7 @@ import com.diligrp.cashier.pipeline.type.OutPaymentType;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.pipeline.type.PaymentType;
 import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.util.DateUtils;
 import com.diligrp.cashier.trade.Constants;
 import com.diligrp.cashier.trade.dao.IOnlinePaymentDao;
 import com.diligrp.cashier.trade.dao.ITradeOrderDao;
@@ -137,13 +138,19 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 在线支付通道
                     // 在线支付通道: 不同的收银台类型使用不同的支付方式(目前只支持小程序收银台)
                     // 小程序收银台将使用在线支付通道的小程序支付
-                    MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(cashierPayment);
-                    MiniProPrepayResponse response = onlinePipeline.sendMiniProPrepayRequest(request);
+//                    MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(cashierPayment);
+//                    MiniProPrepayResponse response = onlinePipeline.sendMiniProPrepayRequest(request);
+                    long seconds = DateUtils.secondsDiff(trade.getCreatedTime(), now);
+                    long timeout = Math.max(trade.getTimeout() - seconds, com.diligrp.cashier.pipeline.Constants.MIN_PIPELINE_TIMEOUT);
+                    NativePrepayRequest request = new NativePrepayRequest(paymentId, trade.getMaxAmount(), trade.getGoods(),
+                        trade.getDescription(), now, timeout);
+                    NativePrepayResponse response = onlinePipeline.sendNativePrepayRequest(request);
+
                     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())
                         .payType(PaymentType.MINI_PRO).pipelineId(onlinePipeline.pipelineId()).goods(trade.getGoods())
-                        .amount(trade.getAmount()).payerId(request.getOpenId()).outTradeNo(response.getOutTradeNo())
+                        .amount(trade.getAmount()).payerId(null).outTradeNo(response.getOutTradeNo())
                         .outPayType(OutPaymentType.NOP).finishTime(null).state(response.getState())
                         .notifyUrl(trade.getNotifyUrl()).description(null).version(0).createdTime(now).modifiedTime(now).build();
                     onlinePaymentDao.insertOnlinePayment(payment);
@@ -357,7 +364,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         } else if (!PaymentState.isFinished(response.getState())) {
             // 固定周期后，查询退款状态，根据状态完成退款订单
             TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
-            taskMessageSender.sendDelayTaskMessage(message, trade.getTimeout());
+            taskMessageSender.sendDelayTaskMessage(message, trade.getTimeout() * 1000);
         }
         return new OnlineRefundResult(refundId, payment.getPaymentId(), response.getState(), response.getWhen(), response.getMessage());