token timeout conf

huanggang
1 parent f67985dc
Showing 12 changed files with 90 additions and 31 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/CashierDeskProperties.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/Constants.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/RcbPaymentController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/WechatPaymentController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/ICashierDeskService.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/MerchantConverter.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/domain/MerchantParams.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/ICashierPaymentService.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
scripts/cashier-data.sql
@@ -7,6 +7,8 @@ import javax.crypto.spec.SecretKeySpec;
 public class CashierDeskProperties {
     // 密钥
     private SecretKeySpec secretKey;
+    // TOKEN过期时间
+    private Long tokenTimeout;
     // 收银台配置
     private MerchantParams.CashierParams cashier;
@@ -18,6 +20,14 @@ public class CashierDeskProperties {
         this.secretKey = secretKey;
     }
+    public Long getTokenTimeout() {
+        return tokenTimeout;
+    }
+
+    public void setTokenTimeout(Long tokenTimeout) {
+        this.tokenTimeout = tokenTimeout;
+    }
+
     public MerchantParams.CashierParams getCashier() {
         return cashier;
     }
@@ -13,9 +13,5 @@ public final class Constants {
     public static final String TOKEN_SIGN_ALGORITHM = "HmacSHA256";
     // TOKEN的签名长度
     public static final int TOKEN_SIGN_LENGTH = 8;
-    // TOKEN过期时长，单位秒 - 5分钟
-    public static final long TOKEN_TIMEOUT_SECONDS = 10 * 60;
-
-    public final static String CONTENT_TYPE = "application/json;charset=UTF-8";
 }
 package com.diligrp.cashier.boss.controller;
 import com.diligrp.cashier.boss.exception.BossServiceException;
+import com.diligrp.cashier.boss.service.ICashierDeskService;
 import com.diligrp.cashier.pipeline.core.RcbOnlinePipeline;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
@@ -12,7 +13,6 @@ import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.diligrp.cashier.shared.util.ObjectUtils;
 import com.diligrp.cashier.trade.model.OnlinePayment;
-import com.diligrp.cashier.trade.service.ICashierPaymentService;
 import com.diligrp.cashier.trade.service.ITradeAssistantService;
 import com.fasterxml.jackson.core.type.TypeReference;
 import jakarta.annotation.Resource;
@@ -40,7 +40,7 @@ public class RcbPaymentController {
     private ITradeAssistantService tradeAssistantService;
     @Resource
-    private ICashierPaymentService cashierPaymentService;
+    private ICashierDeskService cashierDeskService;
     @Resource
     private IPaymentPipelineManager paymentPipelineManager;
@@ -84,7 +84,7 @@ public class RcbPaymentController {
             OnlinePaymentResponse paymentResponse = new OnlinePaymentResponse(paymentId, outTradeNo, outPayType,
                 payerId, when, paymentState, errorDesc);
-            cashierPaymentService.notifyPaymentResponse(paymentResponse);
+            cashierDeskService.notifyPaymentResponse(payment, paymentResponse);
             return ResponseEntity.ok("SUCCESS");
         } catch (Exception ex) {
             LOG.error("Process rcb payment result exception", ex);
 package com.diligrp.cashier.boss.controller;
 import com.diligrp.cashier.boss.exception.BossServiceException;
+import com.diligrp.cashier.boss.service.ICashierDeskService;
 import com.diligrp.cashier.pipeline.core.WechatPartnerPipeline;
 import com.diligrp.cashier.pipeline.core.WechatPipeline;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
@@ -19,7 +20,6 @@ import com.diligrp.cashier.shared.util.DateUtils;
 import com.diligrp.cashier.shared.util.HttpUtils;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.diligrp.cashier.trade.model.OnlinePayment;
-import com.diligrp.cashier.trade.service.ICashierPaymentService;
 import com.diligrp.cashier.trade.service.ITradeAssistantService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
@@ -47,7 +47,7 @@ public class WechatPaymentController {
     private ITradeAssistantService tradeAssistantService;
     @Resource
-    private ICashierPaymentService cashierPaymentService;
+    private ICashierDeskService cashierDeskService;
     @Resource
     private IPaymentPipelineManager paymentPipelineManager;
@@ -87,7 +87,7 @@ public class WechatPaymentController {
                 WechatNotifyResponse response = JsonUtils.fromJsonString(payload, WechatNotifyResponse.class);
                 OnlinePaymentResponse paymentResponse = paymentResponse(pipeline, response);
                 if (WechatConstants.NOTIFY_EVENT_TYPE.equals(response.getEvent_type())) {
-                    cashierPaymentService.notifyPaymentResponse(paymentResponse);
+                    cashierDeskService.notifyPaymentResponse(payment, paymentResponse);
                 }
                 return ResponseEntity.ok(NotifyResult.success());
             } else {
@@ -114,7 +114,7 @@ public class WechatPaymentController {
                 WechatNotifyResponse notifyResponse = JsonUtils.fromJsonString(payload, WechatNotifyResponse.class);
                 if (WechatConstants.REFUND_EVENT_TYPE.equals(notifyResponse.getEvent_type())) {
                     OnlineRefundResponse refundResponse = refundResponse(pipeline, notifyResponse);
-                    cashierPaymentService.notifyRefundResult(refundResponse);
+                    cashierDeskService.notifyRefundResult(refund, refundResponse);
                 }
                 return ResponseEntity.ok(NotifyResult.success());
             } else {
@@ -2,8 +2,11 @@ package com.diligrp.cashier.boss.service;
 import com.diligrp.cashier.boss.domain.CashierOrderVO;
 import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
+import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
+import com.diligrp.cashier.pipeline.domain.OnlineRefundResponse;
 import com.diligrp.cashier.trade.domain.*;
+import com.diligrp.cashier.trade.model.OnlinePayment;
 public interface ICashierDeskService {
     /**
@@ -29,6 +32,14 @@ public interface ICashierDeskService {
     OnlinePaymentStatus doPayment(CashierPayment payment);
     /**
+     * 支付结果通知
+     *
+     * @param payment - 支付订单
+     * @param response - 支付结果
+     */
+    void notifyPaymentResponse(OnlinePayment payment, OnlinePaymentResponse response);
+
+    /**
      * 关闭交易订单
      */
     void closeTradeOrder(String tradeId);
@@ -44,6 +55,14 @@ public interface ICashierDeskService {
     OnlineRefundResult sendRefundRequest(OnlineRefundDTO request);
     /**
+     * 退款结果通知
+     *
+     * @param refund - 退款订单
+     * @param response - 退款结果
+     */
+    void notifyRefundResult(OnlinePayment refund, OnlineRefundResponse response);
+
+    /**
      * 查询退款状态
      */
     OnlineRefundResult queryRefundState(String refundId, String mode);
@@ -9,12 +9,15 @@ import com.diligrp.cashier.boss.exception.BossServiceException;
 import com.diligrp.cashier.boss.service.ICashierDeskService;
 import com.diligrp.cashier.boss.service.IMerchantService;
 import com.diligrp.cashier.pipeline.core.PaymentPipeline;
+import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
+import com.diligrp.cashier.pipeline.domain.OnlineRefundResponse;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.util.ObjectUtils;
 import com.diligrp.cashier.trade.domain.*;
+import com.diligrp.cashier.trade.model.OnlinePayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
 import com.diligrp.cashier.trade.service.ICashierPaymentService;
 import com.diligrp.cashier.trade.service.ITradeAssistantService;
@@ -61,9 +64,9 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         CashierOrderToken orderToken = new CashierOrderToken(merchant.getMchId(), tradeId, order.getType().getCode(),
             order.getUserId(), order.getRedirectUrl());
-        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 tokenKey = String.format(Constants.TRADE_REDIS_KEY, tradeId);
+        stringRedisTemplate.opsForValue().set(tokenKey, orderToken.toString(), params.getTokenTimeout(), TimeUnit.SECONDS);
         String paymentUrl = switch (order.getType()) {
             case MINIPRO -> String.format("%s?%s=%s", params.getCashier().getMiniProUrl(), Constants.TOKEN_PARAM_NAME, token);
             case H5 ->  String.format("%s?%s=%s", params.getCashier().getH5Url(), Constants.TOKEN_PARAM_NAME, token);
@@ -104,7 +107,7 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     @Override
     public OnlinePaymentStatus doPayment(CashierPayment payment) {
         OnlinePaymentStatus paymentStatus =  cashierPaymentService.doPayment(payment);
-        // 收银台支付成功，都使token失效，收银台页面将无法重新打开
+        // 收银台支付成功，使token失效，收银台页面将无法重新打开
         if (paymentStatus.getState() == PaymentState.SUCCESS) {
             String tokenKey = String.format(Constants.TRADE_REDIS_KEY, payment.getTradeId());
             stringRedisTemplate.delete(tokenKey);
@@ -113,8 +116,21 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     }
     @Override
+    public void notifyPaymentResponse(OnlinePayment payment, OnlinePaymentResponse response) {
+        cashierPaymentService.notifyPaymentResponse(payment, response);
+        if (PaymentState.SUCCESS == response.getState()) {
+            // 收银台支付成功，使token失效，收银台页面将无法重新打开
+            String tokenKey = String.format(Constants.TRADE_REDIS_KEY, payment.getTradeId());
+            stringRedisTemplate.delete(tokenKey);
+        }
+    }
+
+    @Override
     public void closeTradeOrder(String tradeId) {
         cashierPaymentService.closeTradeOrder(tradeId);
+        // 使token失效，收银台页面将无法重新打开
+        String tokenKey = String.format(Constants.TRADE_REDIS_KEY, tradeId);
+        stringRedisTemplate.delete(tokenKey);
     }
     @Override
@@ -128,6 +144,11 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     }
     @Override
+    public void notifyRefundResult(OnlinePayment refund, OnlineRefundResponse response) {
+        cashierPaymentService.notifyRefundResult(refund, response);
+    }
+
+    @Override
     public OnlineRefundResult queryRefundState(String refundId, String mode) {
         return cashierPaymentService.queryRefundState(refundId, mode);
     }
@@ -29,6 +29,9 @@ public class MerchantConverter implements IConverter&lt;MerchantDO, Merchant&gt; {
         }
         MerchantParams params = merchant.getParams();
+        if (Objects.isNull(params.getTokenTimeout())) {
+            params.setTokenTimeout(cashierProperties.getTokenTimeout());
+        }
         if (Objects.isNull(params.getCashier())) {
             params.setCashier(new MerchantParams.CashierParams());
         }
@@ -5,6 +5,8 @@ import com.diligrp.cashier.shared.util.JsonUtils;
 import java.util.Objects;
 public class MerchantParams {
+    // TOKEN过期时间 - 单位秒
+    private Long tokenTimeout;
     // 收银台配置
     private CashierParams cashier;
@@ -12,6 +14,14 @@ public class MerchantParams {
         return JsonUtils.fromJsonString(params, MerchantParams.class);
     }
+    public Long getTokenTimeout() {
+        return tokenTimeout;
+    }
+
+    public void setTokenTimeout(Long tokenTimeout) {
+        this.tokenTimeout = tokenTimeout;
+    }
+
     public CashierParams getCashier() {
         return cashier;
     }
@@ -4,6 +4,7 @@ import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
 import com.diligrp.cashier.pipeline.domain.OnlineRefundResponse;
 import com.diligrp.cashier.trade.domain.*;
+import com.diligrp.cashier.trade.model.OnlinePayment;
 public interface ICashierPaymentService {
     /**
@@ -26,9 +27,10 @@ public interface ICashierPaymentService {
     /**
      * 支付结果通知
      *
+     * @param payment - 支付订单
      * @param response - 支付结果
      */
-    void notifyPaymentResponse(OnlinePaymentResponse response);
+    void notifyPaymentResponse(OnlinePayment payment, OnlinePaymentResponse response);
     /**
      * 关闭交易订单
@@ -48,9 +50,10 @@ public interface ICashierPaymentService {
     /**
      * 退款结果通知
      *
+     * @param refund - 退款订单
      * @param response - 退款结果
      */
-    void notifyRefundResult(OnlineRefundResponse response);
+    void notifyRefundResult(OnlinePayment refund, OnlineRefundResponse response);
     /**
      * 查询退款状态
@@ -81,7 +81,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
                             LOG.error("scanCashierTradeOrder: close online prepare order exception", ex);
                         }
                     }
-                    cashierPaymentService.notifyPaymentResponse(response);
+                    cashierPaymentService.notifyPaymentResponse(payment, response);
                 }
             }
             // 交易订单仍然未完成则关闭交易订单，交易订单不能继续支付
@@ -112,7 +112,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
         OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), OnlinePipeline.class);
         OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
         OnlineRefundResponse response = pipeline.queryRefundResponse(order);
-        cashierPaymentService.notifyRefundResult(response);
+        cashierPaymentService.notifyRefundResult(refund, response);
         if (!PaymentState.isFinished(response.getState().getCode())) {
             long delay = pipeline.getTimeStrategy().nextRefundScanTime(times + 1);
             TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, String.valueOf(times + 1));
@@ -111,7 +111,6 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public OnlinePaymentStatus doPayment(CashierPayment payment) {
-        // TODO: 接口防重复提交
         String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, payment.getTradeId());
         RLock lock = redissonClient.getLock(lockKey);
         try {
@@ -178,9 +177,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                         TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.SUCCESS,
                             trade.getVersion(), now);
                         tradeAssistantService.proceedTradeOrder(tradeStateDTO);
-                        // 通知业务系统支付结果，
-                        OnlinePaymentResult paymentResult = new OnlinePaymentResult(trade.getTradeId(), paymentId,
-                            response.getState().getCode(), trade.getOutTradeNo(), OutPaymentType.DILICARD.getCode(),
+                        // 通知业务系统支付结果
+                        OnlinePaymentResult paymentResult = OnlinePaymentResult.of(trade.getTradeId(), paymentId,
+                            response.getState(), trade.getOutTradeNo(), response.getOutPayType(),
                             response.getPayerId(), response.getWhen(), response.getMessage());
                         paymentResultManager.notifyPaymentResult(trade.getNotifyUrl(), paymentResult, 500);
                     }
@@ -209,8 +208,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void notifyPaymentResponse(OnlinePaymentResponse response) {
-        OnlinePayment payment = tradeAssistantService.findByPaymentId(response.getPaymentId());
+    public void notifyPaymentResponse(OnlinePayment payment, OnlinePaymentResponse response) {
         if (PaymentState.isFinished(payment.getState())) {
             LOG.warn("Duplicate process cashier payment response: [{}:{}]", payment.getPaymentId(), response.getState().name());
             return;
@@ -379,8 +377,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void notifyRefundResult(OnlineRefundResponse response) {
-        OnlinePayment refund = tradeAssistantService.findByRefundId(response.getRefundId());
+    public void notifyRefundResult(OnlinePayment refund, OnlineRefundResponse response) {
         if (PaymentState.isFinished(refund.getState())) {
             LOG.warn("Duplicate process cashier refund response: [{}:{}]", response.getRefundId(), response.getState().name());
             return;
 INSERT INTO dili_cashier.upay_merchant(mch_id, name, param, address, linkman, telephone, state, created_time, modified_time)
-VALUES (1001, '安徽省中瑞农副产品有限责任公司', '{"cashier":{"miniProUrl": "https://cashier.test.gszdtop.com/pages/merchant/mp"}}', '安徽省濉溪县南环路中瑞农产品批发市场', '赵静', '0561-6863420', 1, now(), now());
+VALUES (1001, '安徽省中瑞农副产品有限责任公司', '{"cashier":{"miniProUrl": "https://cashier.pay.gszdtop.com/pages/#/payment"}, "tokenTimeout": 600}', '安徽省濉溪县南环路中瑞农产品批发市场', '赵静', '0561-6863420', 1, now(), now());
 -- 中瑞微信支付服务商通道, 根据环境配置不同的参数(服务地址、回调地址等)
 -- INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
--- VALUES (1001, 10011, 10, 10, '微信支付', 'https://api.mch.weixin.qq.com', '{"subMchId":"1679224186", "subAppId":"wxad27b69b888b6dc9", "appSecret":"9c254c0ab932b3c30292a05679a688f7", "notifyUrl": "https://cashier.test.gszdtop.com"}', 1, now(), now());
+-- VALUES (1001, 10011, 10, 10, '微信支付', 'https://api.mch.weixin.qq.com', '{"subMchId":"1679224186", "subAppId":"wxad27b69b888b6dc9", "appSecret":"9c254c0ab932b3c30292a05679a688f7", "notifyUrl": "https://cashier.pay.gszdtop.com"}', 1, now(), now());
 -- INSERT INTO `dili_cashier`.upay_wechat_param(pipeline_id, mch_id, app_id, app_secret, serial_no, private_key, wechat_serial_no, wechat_public_key, api_v3_key, type, created_time)
 -- VALUES(10011, '1679223106', 'wxca99d56a6ab15f29', '9c254c0ab932b3c30292a05679a688f7', '60C2877836D1D618D2E40186995BB00299D92F44','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', 'RSfFvEBBQiHz8GZyDcP2eSUlZJgKjdxk', 2, now());
 -- 中瑞农商行聚合支付通道, 根据环境配置不同的参数(服务地址、回调地址等)
 INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
-VALUES (1001, 10014, 29, 2, '微信支付', 'https://epos.ahrcu.com:3443', '{"merchantNo": "94734065411016B", "terminalNo": "19A03301", "appId": "wx6f15ee0bd788c744", "appSecret": "4ab4152adf21da99c629fe7f3ce6b571", "key": "45913E42F86C18F512BEF54C2F0FE5BF", "notifyUrl": "https://cashier.test.gszdtop.com"}', 1, now(), now());
+VALUES (1001, 10014, 29, 2, '微信支付', 'https://epos.ahrcu.com:3443', '{"merchantNo": "94734065411016B", "terminalNo": "19A03301", "appId": "wx6f15ee0bd788c744", "appSecret": "4ab4152adf21da99c629fe7f3ce6b571", "key": "45913E42F86C18F512BEF54C2F0FE5BF", "notifyUrl": "https://cashier.pay.gszdtop.com"}', 1, now(), now());
 -- 中瑞园区卡支付通道, 根据环境配置不同的参数(服务地址、回调地址等)
 INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
-VALUES (1001, 10012, 19, 2, '园区卡支付', 'http://gateway.dev.nong12.com/pay-service', '{"outMchId": 9, "accountId": 118924}', 1, now(), now());
+VALUES (1001, 10012, 19, 2, '园区卡支付', 'https://gateway.zr.zrgyl.com/pay-service', '{"outMchId": 9, "accountId": 118924}', 1, now(), now());
 -- 高斯智达微信支付直连通道, 根据环境配置不同的参数(服务地址、回调地址等)
 -- INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
--- VALUES (1001, 10013, 10, 10, '微信支付', 'https://api.mch.weixin.qq.com', '{"notifyUrl": "https://cashier.test.gszdtop.com"}', 1, now(), now());
+-- VALUES (1001, 10013, 10, 10, '微信支付', 'https://api.mch.weixin.qq.com', '{"notifyUrl": "https://cashier.pay.gszdtop.com"}', 1, now(), now());
 -- INSERT INTO `dili_cashier`.upay_wechat_param (pipeline_id, mch_id, app_id, app_secret, serial_no, private_key, wechat_serial_no, wechat_public_key, api_v3_key, type, created_time)
 -- VALUES (10013, '1710148119', 'wx5e3c1166921039e4', '6501cbb2f4ececdcf0ef84bc43f6a710', '43D78972EC26DD5E05DB57D837E7EA6078ECD784', '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', 't3sH85QcVkAsPgvdTyWHuCLpFwEtbEG8', 1, now());