upgrade after testing

huanggang
1 parent ea665fba
Showing 12 changed files with 56 additions and 24 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/Constants.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/Constants.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/WechatDirectHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/WechatPartnerHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/MiniProPrepayRequest.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/NativePrepayRequest.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/type/OutPaymentType.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/util/WechatConstants.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/util/DateUtils.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/util/MiniProPaymentConverter.java
@@ -6,7 +6,7 @@ public final class Constants {
     // 商户信息过期时长-单位秒 - 1个小时
     public static final int MERCHANT_TIMEOUT_SECONDS = 60 * 60;
     // TOKEN信息缓存Key
-    public static final String TOKEN_REDIS_KEY = "cashier:token:%s";
+    public static final String TRADE_REDIS_KEY = "cashier:trade:%s";
     // TOKEN参数名称
     public static final String TOKEN_PARAM_NAME = "token";
     // TOKEN签名算法
@@ -56,7 +56,7 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         CashierOrderToken orderToken = new CashierOrderToken(merchant.getMchId(), tradeId, order.getType().getCode(),
             order.getUserId(), order.getRedirectUrl());
-        String tokenKey = String.format(Constants.TOKEN_REDIS_KEY, token);
+        String tokenKey = String.format(Constants.TRADE_REDIS_KEY, tradeId);
         stringRedisTemplate.opsForValue().set(tokenKey, orderToken.toString(), Constants.TOKEN_TIMEOUT_SECONDS, TimeUnit.SECONDS);
         MerchantParams params = merchant.getParams();
         String paymentUrl = switch (order.getType()) {
@@ -70,8 +70,8 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     @Override
     public CashierOrderVO getCashierOrderByToken(String token) {
-        CashierOrderToken.decode(token, cashierDeskProperties.getSecretKey());
-        String tokenKey = String.format(Constants.TOKEN_REDIS_KEY, token);
+        long tradeId = CashierOrderToken.decode(token, cashierDeskProperties.getSecretKey());
+        String tokenKey = String.format(Constants.TRADE_REDIS_KEY, tradeId);
         String payload = stringRedisTemplate.opsForValue().get(tokenKey);
         if (ObjectUtils.isEmpty(payload)) {
             throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "TOKEN超时过期，不能完成支付");
@@ -83,9 +83,6 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
             throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "收银台订单已完成，不能进行支付");
         }
         List<PaymentPipeline> pipelines = paymentPipelineManager.listPipelines(orderToken.getMchId(), PaymentPipeline.class);
-        if (pipelines.isEmpty()) {
-            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "商户无可用的支付通道");
-        }
         List<CashierOrderVO.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
             new CashierOrderVO.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel())).toList();
         return new CashierOrderVO(orderToken.getUserId(), orderToken.getRedirectUrl(), pipelineList);
@@ -102,7 +99,7 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         OnlinePaymentStatus paymentStatus =  cashierPaymentService.doPayment(payment);
         // 只要提交了收银台支付，无论是否支付成功，都使token失效，收银台页面将无法重新打开
         String token = CashierOrderToken.encode(Long.valueOf(payment.getTradeId()), cashierDeskProperties.getSecretKey());
-        String tokenKey = String.format(Constants.TOKEN_REDIS_KEY, token);
+        String tokenKey = String.format(Constants.TRADE_REDIS_KEY, token);
         stringRedisTemplate.delete(tokenKey);
         return paymentStatus;
     }
@@ -18,4 +18,7 @@ public final class Constants {
     public static final long TEN_MINUTES = 10 * ONE_MINUTE;
     public static final long ONE_SECOND = 1000;
+
+    // 支付通道最小超时时间(单位秒), 一分钟
+    public static final long MIN_PIPELINE_TIMEOUT = 60;
 }
@@ -240,7 +240,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         params.put("mchid", wechatConfig.getMchId());
         params.put("description", request.getGoods());
         params.put("out_trade_no", request.getPaymentId());
-        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusMinutes(WechatConstants.PAY_DURATION_MINS),
+        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusSeconds(request.getTimeout()),
             WechatConstants.RFC3339_FORMAT));
         params.put("notify_url", notifyUri);
         Map<String, Object> amount = new LinkedHashMap<>();
@@ -258,7 +258,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         params.put("mchid", wechatConfig.getMchId());
         params.put("description", request.getGoods());
         params.put("out_trade_no", request.getPaymentId());
-        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusMinutes(WechatConstants.PAY_DURATION_MINS),
+        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusSeconds(request.getTimeout()),
             WechatConstants.RFC3339_FORMAT));
         params.put("notify_url", notifyUri);
         Map<String, Object> amount = new LinkedHashMap<>();
@@ -256,7 +256,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         params.put("sub_mchid", subMchId);
         params.put("description", request.getGoods());
         params.put("out_trade_no", request.getPaymentId());
-        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusMinutes(WechatConstants.PAY_DURATION_MINS),
+        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusSeconds(request.getTimeout()),
             WechatConstants.RFC3339_FORMAT));
         params.put("notify_url", notifyUri);
         Map<String, Object> amount = new LinkedHashMap<>();
@@ -278,7 +278,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         params.put("sub_mchid", subMchId);
         params.put("description", request.getGoods());
         params.put("out_trade_no", request.getPaymentId());
-        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusMinutes(WechatConstants.PAY_DURATION_MINS),
+        params.put("time_expire", DateUtils.formatDateTime(request.getWhen().plusSeconds(request.getTimeout()),
             WechatConstants.RFC3339_FORMAT));
         params.put("notify_url", notifyUri);
         Map<String, Object> amount = new LinkedHashMap<>();
@@ -5,13 +5,21 @@ import java.time.LocalDateTime;
 public class MiniProPrepayRequest extends OnlinePaymentRequest {
     // 小程序openId
     private final String openId;
+    // 超时时间-秒
+    private final Long timeout;
-    public MiniProPrepayRequest(String paymentId, long amount, String goods, String description, LocalDateTime when, String openId) {
+    public MiniProPrepayRequest(String paymentId, long amount, String goods, String description, LocalDateTime when,
+                                String openId, Long timeout) {
         super(paymentId, amount, goods, description, when);
         this.openId = openId;
+        this.timeout = timeout;
     }
     public String getOpenId() {
         return openId;
     }
+
+    public Long getTimeout() {
+        return timeout;
+    }
 }
@@ -3,7 +3,16 @@ package com.diligrp.cashier.pipeline.domain;
 import java.time.LocalDateTime;
 public class NativePrepayRequest extends OnlinePaymentRequest {
-    public NativePrepayRequest(String paymentId, long amount, String goods, String description, LocalDateTime when) {
+    // 超时时间-秒
+    private final Long timeout;
+
+    public NativePrepayRequest(String paymentId, long amount, String goods, String description, LocalDateTime when,
+                               Long timeout) {
         super(paymentId, amount, goods, description, when);
+        this.timeout = timeout;
+    }
+
+    public Long getTimeout() {
+        return timeout;
     }
 }
@@ -13,6 +13,8 @@ import java.util.stream.Stream;
  */
 public enum OutPaymentType implements IEnumType {
+    NOP("未知方式", 0),
+
     WXPAY("微信支付", 10),
     ALIPAY("支付宝支付", 11),
@@ -52,6 +52,4 @@ public class WechatConstants {
     public static final String REFUND_PROCESSING = "PROCESSING"; // 退款处理中
     public static final String REFUND_ABNORMAL = "ABNORMAL"; // 退款异常
-    // 预支付订单有效期持续时间，超过这个时间将不能支付
-    public static final int PAY_DURATION_MINS = 8;
 }
@@ -8,6 +8,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.Date;
 /**
@@ -55,8 +56,7 @@ public class DateUtils {
     public static LocalDateTime addDays(long amount) {
         LocalDateTime localDateTime = LocalDateTime.now();
-        localDateTime.plusDays(amount);
-        return localDateTime;
+        return localDateTime.plusDays(amount);
     }
     public static String format(Date date, String format) {
@@ -134,4 +134,14 @@ public class DateUtils {
     public static long timestampInSeconds() {
         return Instant.now().getEpochSecond();
     }
+
+    /**
+     *  两个时间点间隔的秒数
+     *
+     *  2026-01-07 10:00:00 - 2026-01-07 10:00:30, 返回 30
+     *  2026-01-07 10:00:30 - 2026-01-07 10:00:00, 返回 -30
+     */
+    public static long secondsDiff(LocalDateTime startTime, LocalDateTime endTime) {
+        return ChronoUnit.SECONDS.between(startTime, endTime);
+    }
 }
@@ -145,7 +145,8 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                         .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())
-                        .state(response.getState()).version(0).createdTime(now).modifiedTime(now).build();
+                        .outPayType(OutPaymentType.NOP).finishTime(null).state(response.getState())
+                        .notifyUrl(trade.getNotifyUrl()).description(null).version(0).createdTime(now).modifiedTime(now).build();
                     onlinePaymentDao.insertOnlinePayment(payment);
                     return response;
                 } else if (pipeline instanceof DiliCardPipeline cardPipeline) { // 园区卡支付通道
@@ -160,10 +161,10 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                         OnlinePayment payment = OnlinePayment.builder().outMchId(outMchId).tradeId(trade.getTradeId())
                             .type(TradeType.TRADE).paymentId(paymentId).channelId(cardPipeline.supportedChannel())
                             .payType(PaymentType.DIRECT).pipelineId(cardPipeline.pipelineId()).goods(trade.getGoods())
-                            .amount(trade.getAmount()).payerId(response.getPayerId())
-                            .finishTime(response.getWhen()).outTradeNo(response.getOutTradeNo())
-                            .outPayType(response.getOutPayType()).state(response.getState()).notifyUrl(trade.getNotifyUrl())
-                            .description(response.getMessage()).version(0).createdTime(now).modifiedTime(now).build();
+                            .amount(trade.getAmount()).payerId(response.getPayerId()).outTradeNo(response.getOutTradeNo())
+                            .outPayType(response.getOutPayType()).finishTime(response.getWhen()).state(response.getState())
+                            .notifyUrl(trade.getNotifyUrl()).description(response.getMessage()).version(0)
+                            .createdTime(now).modifiedTime(now).build();
                         onlinePaymentDao.insertOnlinePayment(payment);
                         TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.SUCCESS,
@@ -3,6 +3,7 @@ package com.diligrp.cashier.trade.util;
 import com.diligrp.cashier.pipeline.Constants;
 import com.diligrp.cashier.pipeline.domain.MiniProPrepayRequest;
 import com.diligrp.cashier.shared.codec.IConverter;
+import com.diligrp.cashier.shared.util.DateUtils;
 import com.diligrp.cashier.trade.domain.CashierPayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
 import org.springframework.util.Assert;
@@ -31,8 +32,11 @@ public class MiniProPaymentConverter implements IConverter&lt;CashierPayment, MiniP
         String openId = (String) params.get(Constants.PARAM_OPEN_ID);
         Assert.notNull(openId, "params.openId missed");
+        // 根据Trade超时时间，计算得出第三方支付通道的超时时间
+        long seconds = DateUtils.secondsDiff(tradeOrder.getCreatedTime(), when);
+        long timeout = Math.max(tradeOrder.getTimeout() - seconds, Constants.MIN_PIPELINE_TIMEOUT);
         MiniProPrepayRequest prepayRequest = new MiniProPrepayRequest(paymentId, tradeOrder.getMaxAmount(),
-            tradeOrder.getGoods(), tradeOrder.getDescription(), when, openId);
+            tradeOrder.getGoods(), tradeOrder.getDescription(), when, openId, timeout);
         prepayRequest.putParams(params);
         return prepayRequest;
     }