upgrade after testing

huanggang
1 parent 07f54ce2
Showing 33 changed files with 575 additions and 127 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/Constants.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/CashierDeskController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderDTO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderToken.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderInfo.java → cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderVO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/ICashierDeskService.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskManager.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/MerchantServiceImpl.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/CashierOrderConverter.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/CashierOrderConverter2.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/OnlineRefundConverter.java
cashier-boss/src/main/resources/logback-spring.xml
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/type/ChannelType.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/ICashierDeskManager.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/IPaymentEventListener.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/domain/CashierOrderBO.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/domain/CashierRefundBO.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/PaymentEvent.java → cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/domain/PaymentResultBO.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/domain/PaymentUrlBO.java
@@ -3,6 +3,8 @@ package com.diligrp.cashier.boss;
 public final class Constants {
     // 商户信息缓存Key
     public static final String MERCHANT_REDIS_KEY = "cashier:merchant:%s";
+    // 商户信息过期时长-单位秒 - 1个小时
+    public static final int MERCHANT_TIMEOUT_SECONDS = 60 * 60;
     // TOKEN信息缓存Key
     public static final String TOKEN_REDIS_KEY = "cashier:token:%s";
     // TOKEN参数名称
@@ -11,8 +13,8 @@ public final class Constants {
     public static final String TOKEN_SIGN_ALGORITHM = "HmacSHA256";
     // TOKEN的签名长度
     public static final int TOKEN_SIGN_LENGTH = 8;
-    // TOKEN过期时长，单位秒
-    public static final long TOKEN_TIMEOUT_SECONDS = 60;
+    // TOKEN过期时长，单位秒 - 两分钟
+    public static final long TOKEN_TIMEOUT_SECONDS = 120;
     public final static String CONTENT_TYPE = "application/json;charset=UTF-8";
@@ -35,6 +35,7 @@ public class CashierDeskController {
         AssertUtils.notNull(request.getAmount(), "amount missed");
         AssertUtils.isTrue(request.getAmount() > 0, "Invalid amount");
         AssertUtils.notEmpty(request.getOutTradeNo(), "outTradeNo missed");
+        AssertUtils.notEmpty(request.getRedirectUrl(), "redirectUrl missed");
         CashierOrder cashierOrder = CashierOrderConverter.INSTANCE.convert(request);
         Merchant merchant = merchantService.loadCashierMerchant(request.getMchId());
@@ -17,6 +17,8 @@ public class CashierOrderDTO {
     private String outTradeNo;
     // 回调地址
     private String notifyUrl;
+    // 页面回调地址
+    private String redirectUrl;
     // 交易描述
     private String description;
     // 附加数据
@@ -86,6 +88,14 @@ public class CashierOrderDTO {
         this.notifyUrl = notifyUrl;
     }
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+
+    public void setRedirectUrl(String redirectUrl) {
+        this.redirectUrl = redirectUrl;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -21,6 +21,8 @@ public class CashierOrderToken {
     private Integer cashierType;
     // 业务系统用户标识
     private String userId;
+    // 页面回调地址
+    private String redirectUrl;
     public static String encode(Long tokenId, SecretKeySpec secretKey) {
         try {
@@ -70,11 +72,12 @@ public class CashierOrderToken {
     public CashierOrderToken() {
     }
-    public CashierOrderToken(Long mchId, String tradeId, Integer cashierType, String userId) {
+    public CashierOrderToken(Long mchId, String tradeId, Integer cashierType, String userId, String redirectUrl) {
         this.mchId = mchId;
         this.tradeId = tradeId;
         this.cashierType = cashierType;
         this.userId = userId;
+        this.redirectUrl = redirectUrl;
     }
     public Long getMchId() {
@@ -109,6 +112,14 @@ public class CashierOrderToken {
         this.userId = userId;
     }
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+
+    public void setRedirectUrl(String redirectUrl) {
+        this.redirectUrl = redirectUrl;
+    }
+
     @Override
     public String toString() {
         return JsonUtils.toJsonString(this);
 package com.diligrp.cashier.boss.domain;
+import com.diligrp.cashier.pipeline.type.ChannelType;
+
 import java.util.List;
-public class CashierOrderInfo {
+public class CashierOrderVO {
     // 业务系统用户标识
     private final String userId;
+    // 页面回调地址
+    private final String redirectUrl;
     // 支付通道
     private final List<PaymentPipeline> pipelines;
-    public CashierOrderInfo(String userId, List<PaymentPipeline> pipelines) {
+    public CashierOrderVO(String userId, String redirectUrl, List<PaymentPipeline> pipelines) {
         this.userId = userId;
+        this.redirectUrl = redirectUrl;
         this.pipelines = pipelines;
     }
@@ -17,6 +22,10 @@ public class CashierOrderInfo {
         return userId;
     }
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+
     public List<PaymentPipeline> getPipelines() {
         return pipelines;
     }
@@ -27,9 +36,12 @@ public class CashierOrderInfo {
         // 支付渠道
         private final Integer channelId;
-        public PaymentPipeline(Long pipelineId, Integer channelId) {
+        private final String channelName;
+
+        public PaymentPipeline(Long pipelineId, ChannelType channelType) {
             this.pipelineId = pipelineId;
-            this.channelId = channelId;
+            this.channelId = channelType.getCode();
+            this.channelName = channelType.getName();
         }
         public Long getPipelineId() {
@@ -39,5 +51,9 @@ public class CashierOrderInfo {
         public Integer getChannelId() {
             return channelId;
         }
+
+        public String getChannelName() {
+            return channelName;
+        }
     }
 }
 package com.diligrp.cashier.boss.service;
-import com.diligrp.cashier.boss.domain.CashierOrderInfo;
+import com.diligrp.cashier.boss.domain.CashierOrderVO;
 import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
 import com.diligrp.cashier.trade.domain.*;
@@ -18,7 +18,7 @@ public interface ICashierDeskService {
     /**
      * 根据收银台TOKEN信息获取订单信息
      */
-    CashierOrderInfo getCashierOrderByToken(String token);
+    CashierOrderVO getCashierOrderByToken(String token);
     /**
      * 提交收银台支付
+package com.diligrp.cashier.boss.service.impl;
+
+import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
+import com.diligrp.cashier.boss.service.ICashierDeskService;
+import com.diligrp.cashier.boss.service.IMerchantService;
+import com.diligrp.cashier.boss.util.CashierOrderConverter2;
+import com.diligrp.cashier.boss.util.OnlineRefundConverter;
+import com.diligrp.cashier.shared.spi.ICashierDeskManager;
+import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
+import com.diligrp.cashier.shared.spi.domain.CashierRefundBO;
+import com.diligrp.cashier.shared.spi.domain.PaymentUrlBO;
+import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
+import com.diligrp.cashier.shared.util.AssertUtils;
+import com.diligrp.cashier.trade.domain.CashierOrder;
+import com.diligrp.cashier.trade.domain.Merchant;
+import com.diligrp.cashier.trade.domain.OnlineRefundDTO;
+import com.diligrp.cashier.trade.domain.OnlineRefundResult;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+@Service("cashierDeskManager")
+public class CashierDeskManager implements ICashierDeskManager {
+
+    @Resource
+    private ICashierDeskService cashierDeskService;
+
+    @Resource
+    private IMerchantService merchantService;
+
+    @Override
+    public PaymentUrlBO submitOrder(CashierOrderBO request) {
+        // 基本参数校验
+        AssertUtils.notNull(request.getMchId(), "mchId missed");
+        AssertUtils.notEmpty(request.getUserId(), "userId missed");
+        AssertUtils.notNull(request.getCashierType(), "cashierType missed");
+        AssertUtils.notEmpty(request.getGoods(), "goods missed");
+        AssertUtils.notNull(request.getAmount(), "amount missed");
+        AssertUtils.isTrue(request.getAmount() > 0, "Invalid amount");
+        AssertUtils.notEmpty(request.getOutTradeNo(), "outTradeNo missed");
+        AssertUtils.notEmpty(request.getRedirectUrl(), "redirectUrl missed");
+
+        CashierOrder cashierOrder = CashierOrderConverter2.INSTANCE.convert(request);
+        Merchant merchant = merchantService.loadCashierMerchant(request.getMchId());
+        CashierPaymentUrl paymentUrl = cashierDeskService.doSubmit(merchant, cashierOrder);
+        return new PaymentUrlBO(paymentUrl.tradeId(), paymentUrl.paymentUrl());
+    }
+
+    @Override
+    public RefundResultBO doRefund(CashierRefundBO request) {
+        AssertUtils.notEmpty(request.getTradeId(), "tradeId missed");
+        AssertUtils.notNull(request.getAmount(), "amount missed");
+        AssertUtils.isTrue(request.getAmount() > 0, "Invalid amount");
+
+        OnlineRefundDTO onlineRefund = OnlineRefundConverter.INSTANCE.convert(request);
+        OnlineRefundResult response = cashierDeskService.sendRefundRequest(onlineRefund);
+        return new RefundResultBO(response.getRefundId(), response.getTradeId(), response.getState(),
+                response.getWhen(), response.getMessage());
+    }
+}
@@ -2,7 +2,7 @@ package com.diligrp.cashier.boss.service.impl;
 import com.diligrp.cashier.boss.CashierDeskProperties;
 import com.diligrp.cashier.boss.Constants;
-import com.diligrp.cashier.boss.domain.CashierOrderInfo;
+import com.diligrp.cashier.boss.domain.CashierOrderVO;
 import com.diligrp.cashier.boss.domain.CashierOrderToken;
 import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
 import com.diligrp.cashier.boss.exception.BossServiceException;
@@ -53,7 +53,8 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     public CashierPaymentUrl doSubmit(Merchant merchant, CashierOrder order) {
         String tradeId = cashierPaymentService.doSubmit(merchant, order);
         String token = CashierOrderToken.encode(Long.valueOf(tradeId), cashierDeskProperties.getSecretKey());
-        CashierOrderToken orderToken = new CashierOrderToken(merchant.getMchId(), tradeId, order.getType().getCode(), order.getUserId());
+        CashierOrderToken orderToken = new CashierOrderToken(merchant.getMchId(), tradeId, order.getType().getCode(),
+            order.getUserId(), order.getRedirectUrl());
         String tokenKey = String.format(Constants.TOKEN_REDIS_KEY, token);
         stringRedisTemplate.opsForValue().set(tokenKey, orderToken.toString(), Constants.TOKEN_TIMEOUT_SECONDS, TimeUnit.SECONDS);
@@ -68,12 +69,12 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     }
     @Override
-    public CashierOrderInfo getCashierOrderByToken(String token) {
+    public CashierOrderVO getCashierOrderByToken(String token) {
         CashierOrderToken.decode(token, cashierDeskProperties.getSecretKey());
         String tokenKey = String.format(Constants.TOKEN_REDIS_KEY, token);
         String payload = stringRedisTemplate.opsForValue().get(tokenKey);
         if (ObjectUtils.isEmpty(payload)) {
-            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "收银台订单超时过期，不能支付");
+            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "TOKEN超时过期，不能完成支付");
         }
         CashierOrderToken orderToken = CashierOrderToken.decodeCashierOrder(payload);
@@ -85,9 +86,9 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         if (pipelines.isEmpty()) {
             throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "商户无可用的支付通道");
         }
-        List<CashierOrderInfo.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
-            new CashierOrderInfo.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel().getCode())).toList();
-        return new CashierOrderInfo(orderToken.getUserId(), pipelineList);
+        List<CashierOrderVO.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
+            new CashierOrderVO.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel())).toList();
+        return new CashierOrderVO(orderToken.getUserId(), orderToken.getRedirectUrl(), pipelineList);
     }
     /**
@@ -13,6 +13,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 /**
  * 支付平台接入许可服务
@@ -36,8 +37,8 @@ public class MerchantServiceImpl implements IMerchantService {
         Merchant merchant = Merchant.decode(payload);
         if (Objects.isNull(merchant)) {
             merchant = merchantDao.findByMchId(mchId).map(new MerchantConverter(cashierDeskProperties)::convert)
-                .orElseThrow(() -> new BossServiceException(ErrorCode.OBJECT_NOT_FOUND, "商家信息未注册"));
-            stringRedisTemplate.opsForValue().set(cacheKey, merchant.toString());
+                .orElseThrow(() -> new BossServiceException(ErrorCode.OBJECT_NOT_FOUND, "商户信息未注册: " + mchId));
+            stringRedisTemplate.opsForValue().set(cacheKey, merchant.toString(), Constants.MERCHANT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
         }
         return merchant;
@@ -19,6 +19,7 @@ public class CashierOrderConverter implements IConverter&lt;CashierOrderDTO, Cashie
         cashierOrder.setTimeout(cashierOrderDTO.getTimeout());
         cashierOrder.setOutTradeNo(cashierOrderDTO.getOutTradeNo());
         cashierOrder.setNotifyUrl(cashierOrderDTO.getNotifyUrl());
+        cashierOrder.setRedirectUrl(cashierOrderDTO.getRedirectUrl());
         cashierOrder.setDescription(cashierOrderDTO.getDescription());
         cashierOrder.setAttach(cashierOrderDTO.getAttach());
         return cashierOrder;
+package com.diligrp.cashier.boss.util;
+
+import com.diligrp.cashier.pipeline.type.CashierType;
+import com.diligrp.cashier.shared.codec.IConverter;
+import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
+import com.diligrp.cashier.trade.domain.CashierOrder;
+
+public class CashierOrderConverter2 implements IConverter<CashierOrderBO, CashierOrder> {
+
+    public static IConverter<CashierOrderBO, CashierOrder> INSTANCE = new CashierOrderConverter2();
+
+    @Override
+    public CashierOrder convert(CashierOrderBO cashierOrderDTO) {
+        CashierOrder cashierOrder = new CashierOrder();
+        cashierOrder.setUserId(cashierOrderDTO.getUserId());
+        cashierOrder.setType(CashierType.getByCode(cashierOrderDTO.getCashierType()));
+        cashierOrder.setGoods(cashierOrderDTO.getGoods());
+        cashierOrder.setAmount(cashierOrderDTO.getAmount());
+        cashierOrder.setTimeout(cashierOrderDTO.getTimeout());
+        cashierOrder.setOutTradeNo(cashierOrderDTO.getOutTradeNo());
+        cashierOrder.setNotifyUrl(cashierOrderDTO.getNotifyUrl());
+        cashierOrder.setRedirectUrl(cashierOrderDTO.getRedirectUrl());
+        cashierOrder.setDescription(cashierOrderDTO.getDescription());
+        cashierOrder.setAttach(cashierOrderDTO.getAttach());
+        return cashierOrder;
+    }
+}
+package com.diligrp.cashier.boss.util;
+
+import com.diligrp.cashier.shared.codec.IConverter;
+import com.diligrp.cashier.shared.spi.domain.CashierRefundBO;
+import com.diligrp.cashier.trade.domain.OnlineRefundDTO;
+
+public class OnlineRefundConverter implements IConverter<CashierRefundBO, OnlineRefundDTO> {
+
+    public static IConverter<CashierRefundBO, OnlineRefundDTO> INSTANCE = new OnlineRefundConverter();
+
+    @Override
+    public OnlineRefundDTO convert(CashierRefundBO cashierRefund) {
+        OnlineRefundDTO onlineRefund = new OnlineRefundDTO();
+        onlineRefund.setTradeId(cashierRefund.getTradeId());
+        onlineRefund.setAmount(cashierRefund.getAmount());
+        onlineRefund.setNotifyUrl(cashierRefund.getNotifyUrl());
+        onlineRefund.setDescription(cashierRefund.getDescription());
+        return onlineRefund;
+    }
+}
@@ -26,7 +26,7 @@
         </encoder>
         <!-- 过滤器：只输出INFO及以上级别，减少控制台冗余 -->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
+            <level>DEBUG</level>
         </filter>
     </appender>
@@ -15,11 +15,11 @@ import java.util.stream.Stream;
  */
 public enum ChannelType implements IEnumType {
-    WXPAY("微信渠道", 10),
+    WXPAY("微信支付", 10),
-    ALIPAY("支付宝渠道", 11),
+    ALIPAY("支付宝", 11),
-    DILIPAY("地利渠道", 19), // 地利园区卡支付
+    DILIPAY("园区卡支付", 19),
     ICBC("工商银行", 20),
+package com.diligrp.cashier.shared.spi;
+
+import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
+import com.diligrp.cashier.shared.spi.domain.CashierRefundBO;
+import com.diligrp.cashier.shared.spi.domain.PaymentUrlBO;
+import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
+
+public interface ICashierDeskManager {
+
+    /**
+     * 提交收银台订单
+     */
+    PaymentUrlBO submitOrder(CashierOrderBO request);
+
+    /**
+     * 交易退款
+     */
+    RefundResultBO doRefund(CashierRefundBO request);
+}
 package com.diligrp.cashier.shared.spi;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
+
 public interface IPaymentEventListener {
-    void onEvent(PaymentEvent event);
+    void onEvent(PaymentResultBO event);
-    void onEvent(RefundEvent event);
+    void onEvent(RefundResultBO event);
 }
+package com.diligrp.cashier.shared.spi.domain;
+
+public class CashierOrderBO {
+    // 接入商户
+    private Long mchId;
+    // 业务系统用户标识
+    private String userId;
+    // 收银台类型 - H5收银台等
+    private Integer cashierType;
+    // 商品描述
+    private String goods;
+    // 申请金额
+    private Long amount;
+    // 超时间隔时间 - 秒
+    private Integer timeout;
+    // 外部流水号
+    private String outTradeNo;
+    // 回调地址
+    private String notifyUrl;
+    // 页面回调地址
+    private String redirectUrl;
+    // 交易描述
+    private String description;
+    // 附加数据
+    private String attach;
+
+    public Long getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(Long mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public Integer getCashierType() {
+        return cashierType;
+    }
+
+    public void setCashierType(Integer cashierType) {
+        this.cashierType = cashierType;
+    }
+
+    public String getGoods() {
+        return goods;
+    }
+
+    public void setGoods(String goods) {
+        this.goods = goods;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(Integer timeout) {
+        this.timeout = timeout;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+
+    public void setRedirectUrl(String redirectUrl) {
+        this.redirectUrl = redirectUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public void setAttach(String attach) {
+        this.attach = attach;
+    }
+}
+package com.diligrp.cashier.shared.spi.domain;
+
+/**
+ * 退款申请
+ */
+public class CashierRefundBO {
+    // 原支付号
+    private final String tradeId;
+    // 退款金额
+    private final Long amount;
+    // 回调地址
+    private final String notifyUrl;
+    // 退款原因
+    private final String description;
+
+    public CashierRefundBO(String tradeId, Long amount, String notifyUrl, String description) {
+        this.tradeId = tradeId;
+        this.amount = amount;
+        this.notifyUrl = notifyUrl;
+        this.description = description;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}
-package com.diligrp.cashier.shared.spi;
+package com.diligrp.cashier.shared.spi.domain;
 import java.time.LocalDateTime;
-public class PaymentEvent {
+public class PaymentResultBO {
     // 交易号
     private final String tradeId;
     // 支付ID
@@ -20,8 +20,8 @@ public class PaymentEvent {
     // 交易描述
     private final String message;
-    public PaymentEvent(String tradeId, String paymentId, int state, String outTradeNo, Integer outPayType,
-                        String payerId, LocalDateTime when, String message) {
+    public PaymentResultBO(String tradeId, String paymentId, Integer state, String outTradeNo, Integer outPayType,
+                           String payerId, LocalDateTime when, String message) {
         this.tradeId = tradeId;
         this.paymentId = paymentId;
         this.state = state;
+package com.diligrp.cashier.shared.spi.domain;
+
+public record PaymentUrlBO(String tradeId, String paymentUrl) {
+}
-package com.diligrp.cashier.shared.spi;
+package com.diligrp.cashier.shared.spi.domain;
 import java.time.LocalDateTime;
-public class RefundEvent {
+public class RefundResultBO {
     // 退款单号
     private final String refundId;
     // 原支付ID
@@ -14,7 +14,7 @@ public class RefundEvent {
     // 交易描述
     private final String message;
-    public RefundEvent(String refundId, String tradeId, int state, LocalDateTime when, String message) {
+    public RefundResultBO(String refundId, String tradeId, int state, LocalDateTime when, String message) {
         this.refundId = refundId;
         this.tradeId = tradeId;
         this.state = state;
@@ -11,16 +11,19 @@ public final class Constants {
     // 支付通道延时路由KEY
     public static final String PAYMENT_DELAY_KEY = "cashier.payment.delayKey";
-    // 默认订单超时时间-秒, 十分钟
-    public static final int DEFAULT_ORDER_TIMEOUT_SECONDS = 10 * 60 * 1000;
+    // 默认交易订单超时时间-秒, 5分钟
+    public static final int DEFAULT_TRADE_TIMEOUT = 5 * 60;
-    // 最小订单超时时间-秒， 一分钟
-    public static final int MIN_ORDER_TIMEOUT_SECONDS = 60 * 1000;
+    // 最大交易订单超时时间-秒, 10分钟
+    public static final int MAX_TRADE_TIMEOUT = 10 * 60;
+
+    // 最小交易订单超时时间-秒, 1分钟
+    public static final int MIN_TRADE_TIMEOUT = 60;
     // 支付订单分布式锁
     public static final String TRADE_LOCK_REDIS_KEY = "cashier:lock:trade:%s";
-    // 支付订单分布式锁超时时长-秒
-    public static final int TRADE_LOCK_TIMEOUT_SECONDS = 15 * 1000;
+    // 支付订单分布式锁超时时长-秒, 15秒
+    public static final int TRADE_LOCK_TIMEOUT = 15;
 }
@@ -17,6 +17,8 @@ public class CashierOrder {
     private String outTradeNo;
     // 回调地址
     private String notifyUrl;
+    // 页面回调地址
+    private String redirectUrl;
     // 交易描述
     private String description;
     // 附加数据
@@ -78,6 +80,14 @@ public class CashierOrder {
         this.notifyUrl = notifyUrl;
     }
+    public String getRedirectUrl() {
+        return redirectUrl;
+    }
+
+    public void setRedirectUrl(String redirectUrl) {
+        this.redirectUrl = redirectUrl;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -7,7 +7,6 @@ import java.util.Objects;
 public class MerchantParams {
     // 收银台配置
     private CashierParams cashier;
-    // TODO: 支付结果页面-跳转大润发使用
     public static MerchantParams decode(String params) {
         return JsonUtils.fromJsonString(params, MerchantParams.class);
@@ -2,14 +2,30 @@ package com.diligrp.cashier.trade.domain;
 import com.diligrp.cashier.pipeline.type.OutPaymentType;
 import com.diligrp.cashier.pipeline.type.PaymentState;
-import com.diligrp.cashier.shared.spi.PaymentEvent;
 import java.time.LocalDateTime;
 /**
  * 在线支付结果 - 用于业务系统支付结果通知
  */
-public class OnlinePaymentResult extends PaymentEvent {
+public class OnlinePaymentResult {
+    // 交易号
+    private final String tradeId;
+    // 支付ID
+    private final String paymentId;
+    // 支付状态
+    private final Integer state;
+    // 业务系统订单号
+    private final String outTradeNo;
+    // 实际支付方式
+    private final Integer outPayType;
+    // 支付人信息
+    private final String payerId;
+    // 发生时间
+    private final LocalDateTime when;
+    // 交易描述
+    private final String message;
+
     public static OnlinePaymentResult of(String tradeId, String paymentId, PaymentState state, String outTradeNo,
                                          OutPaymentType outPayType, String payerId, LocalDateTime when, String message) {
         Integer outPayTypeCode = outPayType != null ? outPayType.getCode() : null;
@@ -18,6 +34,45 @@ public class OnlinePaymentResult extends PaymentEvent {
     public OnlinePaymentResult(String tradeId, String paymentId, int state, String outTradeNo, Integer outPayType,
                                String payerId, LocalDateTime when, String message) {
-        super(tradeId, paymentId, state, outTradeNo, outPayType, payerId, when, message);
+        this.tradeId = tradeId;
+        this.paymentId = paymentId;
+        this.state = state;
+        this.outTradeNo = outTradeNo;
+        this.outPayType = outPayType;
+        this.payerId = payerId;
+        this.when = when;
+        this.message = message;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public String getPaymentId() {
+        return paymentId;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public Integer getOutPayType() {
+        return outPayType;
+    }
+
+    public String getPayerId() {
+        return payerId;
+    }
+
+    public LocalDateTime getWhen() {
+        return when;
+    }
+
+    public String getMessage() {
+        return message;
     }
 }
@@ -9,7 +9,7 @@ public class OnlineRefundDTO {
     // 退款金额
     private Long amount;
     // 回调地址
-    private String notifyUri;
+    private String notifyUrl;
     // 退款原因
     private String description;
@@ -29,12 +29,12 @@ public class OnlineRefundDTO {
         this.amount = amount;
     }
-    public String getNotifyUri() {
-        return notifyUri;
+    public String getNotifyUrl() {
+        return notifyUrl;
     }
-    public void setNotifyUri(String notifyUri) {
-        this.notifyUri = notifyUri;
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
     }
     public String getDescription() {
 package com.diligrp.cashier.trade.domain;
-import com.diligrp.cashier.shared.spi.RefundEvent;
-
 import java.time.LocalDateTime;
 /**
  * 退款结果
  */
-public class OnlineRefundResult extends RefundEvent {
+public class OnlineRefundResult {
+    // 退款单号
+    private final String refundId;
+    // 原支付ID
+    private final String tradeId;
+    // 支付状态
+    private final Integer state;
+    // 发生时间
+    private final LocalDateTime when;
+    // 交易描述
+    private final String message;
+
     public OnlineRefundResult(String refundId, String tradeId, int state, LocalDateTime when, String message) {
-        super(refundId, tradeId, state, when, message);
+        this.refundId = refundId;
+        this.tradeId = tradeId;
+        this.state = state;
+        this.when = when;
+        this.message = message;
+    }
+
+    public String getRefundId() {
+        return refundId;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public LocalDateTime getWhen() {
+        return when;
+    }
+
+    public String getMessage() {
+        return message;
     }
 }
@@ -3,10 +3,12 @@ package com.diligrp.cashier.trade.manager;
 import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
 import com.diligrp.cashier.shared.service.ThreadPoolService;
 import com.diligrp.cashier.shared.spi.IPaymentEventListener;
+import com.diligrp.cashier.shared.spi.domain.PaymentResultBO;
+import com.diligrp.cashier.shared.spi.domain.RefundResultBO;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.diligrp.cashier.shared.util.ObjectUtils;
-import com.diligrp.cashier.trade.domain.OnlineRefundResult;
 import com.diligrp.cashier.trade.domain.OnlinePaymentResult;
+import com.diligrp.cashier.trade.domain.OnlineRefundResult;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,6 +16,8 @@ import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.stereotype.Service;
 import java.util.List;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 @Service("paymentResultManager")
 public class PaymentResultManager {
@@ -24,34 +28,46 @@ public class PaymentResultManager {
     private ObjectProvider<IPaymentEventListener> eventListeners;
     /**
+     * 通知业务系统在线支付通道处理结果，并阻塞一段时间保证通知完成
+     */
+    public void notifyPaymentResult(String uri, OnlinePaymentResult paymentResult, long waitMillis) {
+        Future<?> future = notifyPaymentResult(uri, paymentResult);
+        try {
+            future.get(waitMillis, TimeUnit.MILLISECONDS);
+        } catch (Exception ex) {
+            // Ignore exception
+        }
+    }
+    /**
      * 通知业务系统在线支付通道处理结果
      */
-    public void notifyPaymentResult(String uri, OnlinePaymentResult payload) {
-        ThreadPoolService.getIoThreadPoll().submit(() -> {
+    public Future<?> notifyPaymentResult(String uri, OnlinePaymentResult paymentResult) {
+        return ThreadPoolService.getIoThreadPoll().submit(() -> {
             List<IPaymentEventListener> lifeCycles = eventListeners.stream().toList();
-            for (IPaymentEventListener listener : lifeCycles) {
-                try {
-                    listener.onEvent(payload);
-                } catch (Exception ex) {
-                    LOG.error("Failed to notify trade payment result", ex);
+            LOG.info("Notifying online payment result: {}, {}", paymentResult.getTradeId(), paymentResult.getPaymentId());
+            if (!lifeCycles.isEmpty()) {
+                PaymentResultBO paymentEvent = new PaymentResultBO(paymentResult.getTradeId(), paymentResult.getPaymentId(),
+                    paymentResult.getState(), paymentResult.getOutTradeNo(), paymentResult.getOutPayType(),
+                    paymentResult.getPayerId(), paymentResult.getWhen(), paymentResult.getMessage());
+                for (IPaymentEventListener listener : lifeCycles) {
+                    try {
+                        listener.onEvent(paymentEvent);
+                    } catch (Exception ex) {
+                        LOG.error("Failed to notify online payment result", ex);
+                    }
                 }
             }
-        });
-        if (ObjectUtils.isEmpty(uri)) {
-            return;
-        }
-
-        ThreadPoolService.getIoThreadPoll().submit(() -> {
-            try {
-                String body = JsonUtils.toJsonString(payload);
-                LOG.info("Notifying online trade payment result: {}", body);
-                ServiceEndpointSupport.HttpResult httpResult = new NotifyHttpClient(uri).send(body);
-                if (httpResult.statusCode != 200) {
-                    LOG.error("Failed to notify trade payment result");
-                }
-            } catch (Exception ex) {
-                LOG.error("Failed to notify trade payment result", ex);
+            if (ObjectUtils.isEmpty(uri)) {
+                try {
+                    String payload = JsonUtils.toJsonString(paymentResult);
+                    ServiceEndpointSupport.HttpResult httpResult = new NotifyHttpClient(uri).send(payload);
+                    if (httpResult.statusCode != 200) {
+                        LOG.error("Failed to notify online payment result");
+                    }
+                } catch (Exception ex) {
+                    LOG.error("Failed to notify online payment result", ex);
+                };
             }
         });
     }
@@ -59,14 +75,18 @@ public class PaymentResultManager {
     /**
      * 通知业务系统退款处理结果
      */
-    public void notifyRefundResult(String uri, OnlineRefundResult payload) {
+    public void notifyRefundResult(String uri, OnlineRefundResult refundResult) {
         ThreadPoolService.getIoThreadPoll().submit(() -> {
             List<IPaymentEventListener> lifeCycles = eventListeners.stream().toList();
-            for (IPaymentEventListener listener : lifeCycles) {
-                try {
-                    listener.onEvent(payload);
-                } catch (Exception ex) {
-                    LOG.error("Failed to notify trade refund result", ex);
+            if (!lifeCycles.isEmpty()) {
+                RefundResultBO refundEvent = new RefundResultBO(refundResult.getRefundId(), refundResult.getTradeId(),
+                    refundResult.getState(), refundResult.getWhen(), refundResult.getMessage());
+                for (IPaymentEventListener listener : lifeCycles) {
+                    try {
+                        listener.onEvent(refundEvent);
+                    } catch (Exception ex) {
+                        LOG.error("Failed to notify trade refund result", ex);
+                    }
                 }
             }
         });
@@ -77,9 +97,9 @@ public class PaymentResultManager {
         ThreadPoolService.getIoThreadPoll().submit(() -> {
             try {
-                String body = JsonUtils.toJsonString(payload);
-                LOG.info("Notifying online trade refund result: {}", body);
-                ServiceEndpointSupport.HttpResult httpResult = new NotifyHttpClient(uri).send(body);
+                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");
                 }
@@ -35,7 +35,7 @@ public class TaskMessageConsumer {
                 ? properties.getContentEncoding() : StandardCharsets.UTF_8.name();
         try {
             String body = new String(packet, charSet);
-            LOG.info("Receiving online pipeline async task request: {}", body);
+            LOG.info("Receiving async delay task message: {}", body);
             TaskMessage task = TaskMessage.fromJson(body);
             int times = NumberUtils.str2Int(task.getParams(), Integer.MAX_VALUE);
             if (task.getType() == TaskMessage.TYPE_CASHIER_ORDER_SCAN) {
@@ -46,7 +46,7 @@ public class TaskMessageConsumer {
                 LOG.error("Never happened");
             }
         } catch (Exception ex) {
-            LOG.error("Consume online pipeline async message exception", ex);
+            LOG.error("Consume async delay task message exception", ex);
         }
     }
 }
@@ -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 online payment order scan request for {}", task.getPayload());
+                LOG.info("Sending async delay task message for {}", task.getPayload());
                 rabbitTemplate.send(Constants.PAYMENT_DELAY_EXCHANGE, Constants.PAYMENT_DELAY_KEY, message);
             } catch (Exception ex) {
-                LOG.error("Failed to send online payment order scan request for {}", task.getPayload(), ex);
+                LOG.error("Failed to send async delay task message for {}", task.getPayload(), ex);
             }
         });
     }
 package com.diligrp.cashier.trade.service.impl;
-import com.diligrp.cashier.pipeline.Constants;
 import com.diligrp.cashier.pipeline.core.OnlinePipeline;
 import com.diligrp.cashier.pipeline.core.PaymentPipeline;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
@@ -9,6 +8,7 @@ import com.diligrp.cashier.pipeline.domain.OnlineRefundOrder;
 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.trade.Constants;
 import com.diligrp.cashier.trade.dao.IOnlinePaymentDao;
 import com.diligrp.cashier.trade.domain.TradeStateDTO;
 import com.diligrp.cashier.trade.model.OnlinePayment;
@@ -49,13 +49,13 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
     @Override
     public void scanCashierTradeOrder(String tradeId, int times) {
-        LOG.debug("scanCashierTradeOrder{}: processing cashier order {}", times, tradeId);
-        String lockKey = String.format(com.diligrp.cashier.trade.Constants.TRADE_LOCK_REDIS_KEY, tradeId);
+        LOG.debug("scanCashierTradeOrder{}: processing cashier trade order {}", times, tradeId);
+        String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, tradeId);
         RLock lock = redissonClient.getLock(lockKey);
         try {
             lock.lock();
             LocalDateTime now = LocalDateTime.now();
-            // 理论上只会存在一条支付中的支付订单
+            // 查询交易订单下状态为支付中的支付订单, 理论上只有一条支付记录
             List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(tradeId,
                 TradeType.TRADE.getCode(), PaymentState.PROCESSING.getCode());
             // 关闭所有未支付完成的支付订单
@@ -65,7 +65,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
                     OnlinePrepayOrder order = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
                     // 微信服务商模式，还需子商户
-                    order.attach(Constants.PARAM_MCH_ID, payment.getOutMchId());
+                    order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
                     OnlinePaymentResponse response = onlinePipeline.queryPrepayResponse(order);
                     if (!PaymentState.isFinished(response.getState().getCode())) {
                         try {
@@ -75,7 +75,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
                                 response.getOutPayType(), response.getPayerId(), response.getWhen(),
                                 PaymentState.FAILED, "自动关闭超时的支付订单");
                         } catch (Exception ex) {
-                            LOG.error("scanOnlinePrepayOrder: close online prepare order exception", ex);
+                            LOG.error("scanCashierTradeOrder: close online prepare order exception", ex);
                         }
                     }
                     cashierPaymentService.notifyPaymentResponse(response);
@@ -84,7 +84,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
             // 交易订单仍然未完成则关闭交易订单，交易订单不能继续支付
             TradeOrder trade = tradeAssistantService.findByTradeId(tradeId);
             if (!TradeState.isFinished(trade.getState())) {
-                TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.FAILED, trade.getVersion(), now);
+                TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.CLOSED, trade.getVersion(), now);
                 tradeAssistantService.proceedTradeOrder(tradeStateDTO);
             }
         } finally {
@@ -106,7 +106,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
         OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), OnlinePipeline.class);
         OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
         // 微信服务商模式，还需子商户
-        order.attach(Constants.PARAM_MCH_ID, refund.getOutMchId());
+        order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, refund.getOutMchId());
         OnlineRefundResponse response = pipeline.queryRefundResponse(order);
         cashierPaymentService.notifyRefundResult(response);
     }
@@ -20,8 +20,8 @@ import com.diligrp.cashier.trade.dao.IOnlinePaymentDao;
 import com.diligrp.cashier.trade.dao.ITradeOrderDao;
 import com.diligrp.cashier.trade.domain.*;
 import com.diligrp.cashier.trade.exception.TradePaymentException;
-import com.diligrp.cashier.trade.manager.TaskMessageSender;
 import com.diligrp.cashier.trade.manager.PaymentResultManager;
+import com.diligrp.cashier.trade.manager.TaskMessageSender;
 import com.diligrp.cashier.trade.model.OnlinePayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
 import com.diligrp.cashier.trade.service.ICashierPaymentService;
@@ -84,8 +84,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     public String doSubmit(Merchant merchant, CashierOrder cashierOrder) {
         LocalDateTime now = LocalDateTime.now();
         String tradeId = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.TRADE_ID).nextId();
-        int timeout = Objects.isNull(cashierOrder.getTimeout()) ? Constants.DEFAULT_ORDER_TIMEOUT_SECONDS : cashierOrder.getTimeout();
-        timeout = Math.max(timeout, Constants.MIN_ORDER_TIMEOUT_SECONDS);
+        // 订单超时时间在1至10分钟之间，默认为5分钟
+        int timeout = Objects.isNull(cashierOrder.getTimeout()) ? Constants.DEFAULT_TRADE_TIMEOUT : cashierOrder.getTimeout();
+        timeout = Math.min(Math.max(timeout, Constants.MIN_TRADE_TIMEOUT),  Constants.MAX_TRADE_TIMEOUT);
         TradeOrder tradeOrder = TradeOrder.builder().mchId(merchant.getMchId()).tradeId(tradeId)
             .type(cashierOrder.getType().getCode()).outTradeNo(cashierOrder.getOutTradeNo()).amount(cashierOrder.getAmount())
             .maxAmount(cashierOrder.getAmount()).goods(cashierOrder.getGoods()).timeout(timeout).state(TradeState.PENDING.getCode())
@@ -93,10 +94,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             .source(0).version(0).createdTime(now).modifiedTime(now).build();
         tradeOrderDao.insertTradeOrder(tradeOrder);
-        // TODO: userId是否需要存储
         // 兜底处理交易订单，根据支付结果选择关闭或完成交易订单
         TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_ORDER_SCAN, tradeId, "1");
-        taskMessageSender.sendDelayTaskMessage(message, timeout);
+        taskMessageSender.sendDelayTaskMessage(message, timeout * 1000); // 转换成毫秒
         return tradeId;
     }
@@ -113,7 +113,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, cashierPayment.getTradeId());
         RLock lock = redissonClient.getLock(lockKey);
         try {
-            boolean locked = lock.tryLock(Constants.TRADE_LOCK_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+            boolean locked = lock.tryLock(Constants.TRADE_LOCK_TIMEOUT, TimeUnit.SECONDS);
             if (locked) {
                 TradeOrder trade = tradeAssistantService.findByTradeId(cashierPayment.getTradeId());
                 CashierType cashierType = CashierType.getByCode(trade.getType());
@@ -131,52 +131,50 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 LocalDateTime now = LocalDateTime.now();
                 // 获取支付通道
-                PaymentPipeline<?> paymentPipeline = paymentPipelineManager.findPipelineById(
+                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(
                     cashierPayment.getPipelineId(), PaymentPipeline.class);
                 String paymentId = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID).nextId();
-                if (paymentPipeline instanceof OnlinePipeline<?> pipeline) { // 在线支付通道
+                if (pipeline instanceof OnlinePipeline<?> onlinePipeline) { // 在线支付通道
                     // 在线支付通道: 不同的收银台类型使用不同的支付方式(目前只支持小程序收银台)
                     // 小程序收银台将使用在线支付通道的小程序支付
                     MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(cashierPayment);
-                    MiniProPrepayResponse response = pipeline.sendMiniProPrepayRequest(request);
+                    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(pipeline.supportedChannel())
-                        .payType(PaymentType.MINI_PRO).pipelineId(pipeline.pipelineId()).goods(trade.getGoods())
+                        .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();
                     onlinePaymentDao.insertOnlinePayment(payment);
                     return response;
                 }
-                if (paymentPipeline instanceof DiliCardPipeline pipeline) { // 园区卡支付通道
+                if (pipeline instanceof DiliCardPipeline cardPipeline) { // 园区卡支付通道
                     // 园区卡支付通道: 所有的收银台类型使用的是同一种园区卡支付流程
                     CardPaymentRequest request = new CardPaymentConverter(trade, paymentId, now).convert(cashierPayment);
                     // 修改支付状态为支付中，防止重复支付
-                    CardPaymentResponse response = pipeline.sendPaymentRequest(request);
-                    if (PaymentState.isFinished(response.getState().getCode())) {
+                    CardPaymentResponse response = cardPipeline.sendPaymentRequest(request);
+                    // 支付成功插入支付记录并修改交易订单状态，失败可以继续支付
+                    if (response.getState() == PaymentState.SUCCESS) {
                         // 园区卡支付通道outMchId为市场ID
-                        String outMchId = pipeline.params().getOutMchId();
+                        String outMchId = cardPipeline.params().getOutMchId();
                         OnlinePayment payment = OnlinePayment.builder().outMchId(outMchId).tradeId(trade.getTradeId())
-                            .type(TradeType.TRADE).paymentId(paymentId).channelId(pipeline.supportedChannel())
-                            .payType(PaymentType.DIRECT).pipelineId(pipeline.pipelineId()).goods(trade.getGoods())
+                            .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(OutPaymentType.DILICARD).state(response.getState()).notifyUrl(trade.getNotifyUrl())
                             .description(response.getMessage()).version(0).createdTime(now).modifiedTime(now).build();
                         onlinePaymentDao.insertOnlinePayment(payment);
-                        // 只有成功才修改交易订单状态，此时交易订单仍然可以继续支付
-                        if (response.getState() == PaymentState.SUCCESS) {
-                            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(),
-                                    response.getPayerId(), response.getWhen(), response.getMessage());
-                            paymentResultManager.notifyPaymentResult(trade.getNotifyUrl(), paymentResult);
-                        }
+                        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(),
+                            response.getPayerId(), response.getWhen(), response.getMessage());
+                        paymentResultManager.notifyPaymentResult(trade.getNotifyUrl(), paymentResult, 500);
                     }
                     return response;
                 } else {
@@ -205,10 +203,10 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     public void notifyPaymentResponse(OnlinePaymentResponse response) {
         OnlinePayment payment = tradeAssistantService.findByPaymentId(response.getPaymentId());
         if (PaymentState.isFinished(payment.getState())) {
-            LOG.warn("Duplicate process payment result notification for {}:{}", payment.getPaymentId(), response.getState());
+            LOG.warn("Duplicate process payment response: [{}:{}]", payment.getPaymentId(), response.getState());
             return;
         }
-        LOG.info("Processing payment result notification: [{},{}]", payment.getPaymentId(), response.getState());
+        LOG.info("Processing payment response: [{},{}]", payment.getPaymentId(), response.getState());
         if (PaymentState.isFinished(response.getState().getCode())) {
             LocalDateTime now = LocalDateTime.now();
@@ -224,14 +222,14 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 tradeAssistantService.proceedOnlinePayment(paymentDTO);
                 // 交易订单未完成，支付订单成功支付时处理交易订单，并通知业务系统支付结果；如果支付订单支付失败，收银台交易订单可以继续支付
-                if (TradeState.PENDING.equalTo(trade.getState()) && PaymentState.SUCCESS == response.getState()) {
+                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(),
                         response.getState(), trade.getOutTradeNo(), response.getOutPayType(), response.getPayerId(),
                         response.getWhen() != null ? response.getWhen() : now, response.getMessage());
-                    paymentResultManager.notifyPaymentResult(trade.getNotifyUrl(), paymentResult);
+                    paymentResultManager.notifyPaymentResult(trade.getNotifyUrl(), paymentResult, 500);
                 }
             } finally {
                 if (lock.isHeldByCurrentThread()) {
@@ -280,6 +278,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     @Override
     public OnlinePaymentResult queryPaymentState(String paymentId, String mode) {
+        // TODO: 支付成功后返回支付成功的页面地址
         OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
         TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
+INSERT INTO upay_merchant(mch_id, name, param, address, linkman, telephone, state, created_time, modified_time)
+VALUES (1001, '安徽省中瑞农副产品有限责任公司', '{"cashier":{"miniProUrl": "https://cashier.pay.gszdtop.com/merchant/mp"}}', '安徽省濉溪县南环路中瑞农产品批发市场', '赵静', '0561-6863420', 1, now(), now());
 \ No newline at end of file