refund result url issue fixed

huanggang
1 parent 65ad34a1
Showing 2 changed files with 16 additions and 24 deletions
cashier-trade/src/main/java/com/diligrp/cashier/trade/manager/PaymentResultManager.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
@@ -90,22 +90,20 @@ public class PaymentResultManager {
                     }
                 }
             }
-        });
-
-        if (ObjectUtils.isNotEmpty(uri)) {
-            return;
-        }
-        ThreadPoolService.getIoThreadPoll().submit(() -> {
-            try {
-                String payload = JsonUtils.toJsonString(refundResult);
-                LOG.info("Notifying online trade refund result: {}", payload);
-                ServiceEndpointSupport.HttpResult httpResult = new NotifyHttpClient(uri).send(payload);
-                if (httpResult.statusCode != 200) {
-                    LOG.error("Failed to notify trade refund result");
-                }
-            } catch (Exception ex) {
-                LOG.error("Failed to notify trade refund result", ex);
+            if (ObjectUtils.isNotEmpty(uri)) {
+                ThreadPoolService.getIoThreadPoll().submit(() -> {
+                    try {
+                        String payload = JsonUtils.toJsonString(refundResult);
+                        LOG.info("Notifying online trade refund result: {}", payload);
+                        ServiceEndpointSupport.HttpResult httpResult = new NotifyHttpClient(uri).send(payload);
+                        if (httpResult.statusCode != 200) {
+                            LOG.error("Failed to notify trade refund result");
+                        }
+                    } catch (Exception ex) {
+                        LOG.error("Failed to notify trade refund result", ex);
+                    }
+                });
             }
         });
     }
@@ -138,19 +138,13 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 在线支付通道
                     // 在线支付通道: 不同的收银台类型使用不同的支付方式(目前只支持小程序收银台)
                     // 小程序收银台将使用在线支付通道的小程序支付
-//                    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);
-
+                    MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(cashierPayment);
+                    MiniProPrepayResponse response = onlinePipeline.sendMiniProPrepayRequest(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(null).outTradeNo(response.getOutTradeNo())
+                        .amount(trade.getAmount()).payerId(request.getOpenId()).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);