improve cashier api

huanggang
1 parent e6fca59a
Showing 43 changed files with 1462 additions and 191 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/controller/WechatPaymentController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderInfo.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderToken.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/HttpUtils.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/core/DiliCardPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/OnlinePaymentResponse.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/card/CardPaymentResponse.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/service/IWechatPaymentService.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/service/impl/WechatPaymentServiceImpl.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/type/PaymentState.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/IPaymentEventListener.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/PaymentEvent.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/RefundEvent.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/Constants.java
@@ -13,4 +13,7 @@ public final class Constants {
     public static final int TOKEN_SIGN_LENGTH = 8;
     // TOKEN过期时长，单位秒
     public static final long TOKEN_TIMEOUT_SECONDS = 60;
+
+    public final static String CONTENT_TYPE = "application/json;charset=UTF-8";
+
 }
@@ -8,12 +8,11 @@ import com.diligrp.cashier.boss.util.CashierOrderConverter;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
 import com.diligrp.cashier.shared.domain.Message;
 import com.diligrp.cashier.shared.util.AssertUtils;
-import com.diligrp.cashier.trade.domain.CashierOrder;
-import com.diligrp.cashier.trade.domain.CashierPayment;
-import com.diligrp.cashier.trade.domain.Merchant;
+import com.diligrp.cashier.trade.domain.*;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 @RestController
@@ -43,6 +42,11 @@ public class CashierDeskController {
         return Message.success(paymentUrl);
     }
+    @RequestMapping("/orderInfo")
+    public Message<?> orderInfo(@RequestParam("token") String token) {
+        return Message.success(cashierDeskService.getCashierOrderByToken(token));
+    }
+
     @RequestMapping("/orderPayment")
     public Message<?> orderPayment(@RequestBody CashierPayment request) {
         // 基本参数校验
@@ -52,4 +56,36 @@ public class CashierDeskController {
         OnlinePaymentStatus paymentStatus = cashierDeskService.doPayment(request);
         return Message.success(paymentStatus);
     }
+
+    @RequestMapping("/orderClose")
+    public Message<?> orderPayment(@RequestParam("paymentId") String paymentId) {
+        cashierDeskService.closePrepayOrder(paymentId);
+        return Message.success();
+    }
+
+    @RequestMapping(value = "/paymentState")
+    public Message<?> paymentState(@RequestParam("paymentId") String paymentId,
+                                   @RequestParam(name = "mode", required = false) String mode) {
+
+        OnlinePaymentResult response = cashierDeskService.queryPaymentState(paymentId, mode);
+        return Message.success(response);
+    }
+
+    @RequestMapping(value = "/orderRefund.do")
+    public Message<?> requestRefund(@RequestBody OnlineRefundDTO request) {
+        AssertUtils.notEmpty(request.getTradeId(), "tradeId missed");
+        AssertUtils.notNull(request.getAmount(), "amount missed");
+        AssertUtils.isTrue(request.getAmount() > 0, "Invalid amount");
+
+        OnlineRefundResult response = cashierDeskService.sendRefundRequest(request);
+        return Message.success(response);
+    }
+
+    @RequestMapping(value = "/refundState")
+    public Message<?> refundState(@RequestParam("refundId") String refundId,
+                                  @RequestParam(name = "mode", required = false) String mode) {
+
+        OnlineRefundResult response = cashierDeskService.queryRefundState(refundId, mode);
+        return Message.success(response);
+    }
 }
+package com.diligrp.cashier.boss.controller;
+
+import com.diligrp.cashier.boss.exception.BossServiceException;
+import com.diligrp.cashier.boss.util.HttpUtils;
+import com.diligrp.cashier.pipeline.core.WechatPartnerPipeline;
+import com.diligrp.cashier.pipeline.core.WechatPipeline;
+import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
+import com.diligrp.cashier.pipeline.domain.OnlineRefundResponse;
+import com.diligrp.cashier.pipeline.domain.wechat.*;
+import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
+import com.diligrp.cashier.pipeline.service.IWechatPaymentService;
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+import com.diligrp.cashier.pipeline.util.WechatConstants;
+import com.diligrp.cashier.pipeline.util.WechatSignatureUtils;
+import com.diligrp.cashier.pipeline.util.WechatStateUtils;
+import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.domain.Message;
+import com.diligrp.cashier.shared.util.DateUtils;
+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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+@RestController
+@RequestMapping(value = "/wechat")
+public class WechatPaymentController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(WechatPaymentController.class);
+
+    @Resource
+    private IWechatPaymentService wechatPaymentService;
+
+    @Resource
+    private ITradeAssistantService tradeAssistantService;
+
+    @Resource
+    private ICashierPaymentService cashierPaymentService;
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    @RequestMapping(value = "/payment/openId.do")
+    public Message<?> openId(@RequestParam("pipelineId") Long pipelineId, @RequestParam("code") String code) {
+        String openId = wechatPaymentService.openIdByCode(pipelineId, code);
+        return Message.success(openId);
+    }
+
+    @RequestMapping(value = "/payment/deliver.do")
+    public Message<?> deliverGoods(@RequestParam("paymentId") String paymentId,
+                                   @RequestParam("logisticsType") Integer logisticsType) {
+        OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
+        if (!PaymentState.SUCCESS.equalTo(payment.getState())) {
+            throw new BossServiceException(ErrorCode.INVALID_OBJECT_STATE, "微信订单未完成支付，不能进行发货操作");
+        }
+
+        UploadShippingRequest request = UploadShippingRequest.of(payment.getOutTradeNo(), logisticsType,
+            payment.getGoods(), payment.getPayerId());
+        wechatPaymentService.deliverGoods(payment.getPipelineId(), request);
+        return Message.success();
+    }
+
+    /**
+     * 微信支付结果通知
+     */
+    @RequestMapping(value = "/payment/{paymentId}/notify.do")
+    public ResponseEntity<NotifyResult> paymentNotify(HttpServletRequest request, @PathVariable("paymentId") String paymentId) {
+        LOG.info("Receiving wechat payment result notify for {}", paymentId);
+        String payload = HttpUtils.httpBody(request);
+
+        try {
+            OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
+            WechatPipeline pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), WechatPipeline.class);
+            if (dataVerify(request, pipeline, payload)) {
+                WechatNotifyResponse response = JsonUtils.fromJsonString(payload, WechatNotifyResponse.class);
+                OnlinePaymentResponse paymentResponse = paymentResponse(pipeline, response);
+                if (WechatConstants.NOTIFY_EVENT_TYPE.equals(response.getEvent_type())) {
+                    cashierPaymentService.notifyPaymentResponse(paymentResponse);
+                }
+                return ResponseEntity.ok(NotifyResult.success());
+            } else {
+                LOG.error("Wechat payment result notify data verify failed");
+                return ResponseEntity.badRequest().body(NotifyResult.failure("Data verify failed"));
+            }
+        } catch (Exception ex) {
+            LOG.error("Process wechat payment result notify exception", ex);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                .body(NotifyResult.failure("Process wechat payment result notify exception"));
+        }
+    }
+
+    /*@RequestMapping(value = "/refund/{refundId}/notify.do")
+    public ResponseEntity<NotifyResult> refundNotify(HttpServletRequest request, @PathVariable("refundId") String refundId) {
+        LOG.info("Receiving wechat refund result notify for {}", refundId);
+        String payload = HttpUtils.httpBody(request);
+
+        try {
+            OnlinePayment refund = onlinePaymentService.findByRefundId(refundId);
+            WechatPipeline pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), WechatPipeline.class);
+
+            if (dataVerify(request, pipeline, payload)) {
+                WechatNotifyResponse notifyResponse = JsonUtils.fromJsonString(payload, WechatNotifyResponse.class);
+                if (WechatConstants.REFUND_EVENT_TYPE.equals(notifyResponse.getEvent_type())) {
+                    OnlineRefundResponse refundResponse = refundResponse(pipeline, notifyResponse);
+                    onlinePaymentService.notifyRefundResult(refundResponse);
+                }
+                return ResponseEntity.ok(NotifyResult.success());
+            } else {
+                LOG.error("Wechat refund result notify data verify failed");
+                return ResponseEntity.badRequest().body(NotifyResult.failure("Data verify failed"));
+            }
+        } catch (Exception ex) {
+            LOG.error("Process wechat refund result notify exception", ex);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+                .body(NotifyResult.failure("Process wechat refund result notify exception"));
+        }
+    }*/
+
+    private OnlinePaymentResponse paymentResponse(WechatPipeline pipeline, WechatNotifyResponse notifyResponse) throws Exception {
+        WechatNotifyResponse.Resource resource = notifyResponse.getResource();
+        String payload = WechatSignatureUtils.decrypt(resource.getCiphertext(), resource.getNonce(),
+            resource.getAssociated_data(), pipeline.getClient().getWechatConfig().getApiV3Key());
+        if (pipeline instanceof WechatPartnerPipeline) {
+            PartnerPaymentResponse response = JsonUtils.fromJsonString(payload, PartnerPaymentResponse.class);
+            LocalDateTime when = DateUtils.parseDateTime(response.getSuccess_time(), WechatConstants.RFC3339_FORMAT);
+            String payer = response.getPayer() == null ? null : response.getPayer().getSp_openid();
+            PaymentState paymentState = WechatStateUtils.getPaymentState(response.getTrade_state());
+            return new OnlinePaymentResponse(response.getOut_trade_no(), response.getTransaction_id(), OutPaymentType.WXPAY,
+                    payer, when, paymentState, response.getTrade_state_desc());
+        } else {
+            DirectPaymentResponse response = JsonUtils.fromJsonString(payload, DirectPaymentResponse.class);
+            LocalDateTime when = DateUtils.parseDateTime(response.getSuccess_time(), WechatConstants.RFC3339_FORMAT);
+            String payer = response.getPayer() == null ? null : response.getPayer().getOpenid();
+            PaymentState paymentState = WechatStateUtils.getPaymentState(response.getTrade_state());
+            return new OnlinePaymentResponse(response.getOut_trade_no(), response.getTransaction_id(), OutPaymentType.WXPAY,
+                payer, when, paymentState, response.getTrade_state_desc());
+        }
+    }
+
+    private OnlineRefundResponse refundResponse(WechatPipeline pipeline, WechatNotifyResponse notifyResponse) throws Exception {
+        WechatNotifyResponse.Resource resource = notifyResponse.getResource();
+        String payload = WechatSignatureUtils.decrypt(resource.getCiphertext(), resource.getNonce(),
+            resource.getAssociated_data(), pipeline.getClient().getWechatConfig().getApiV3Key());
+        RefundNotifyResponse response = JsonUtils.fromJsonString(payload, RefundNotifyResponse.class);
+        LocalDateTime when = DateUtils.parseDateTime(response.getSuccess_time(), WechatConstants.RFC3339_FORMAT);
+        PaymentState refundState = WechatStateUtils.getRefundState(response.getRefund_status());
+        return OnlineRefundResponse.of(response.getOut_refund_no(), response.getRefund_id(), when,
+            refundState.getCode(), response.getRefund_status());
+    }
+
+    private boolean dataVerify(HttpServletRequest request, WechatPipeline pipeline, String payload) {
+        String serialNo = request.getHeader(WechatConstants.HEADER_SERIAL_NO);
+        String timestamp = request.getHeader(WechatConstants.HEADER_TIMESTAMP);
+        String nonce = request.getHeader(WechatConstants.HEADER_NONCE);
+        String sign = request.getHeader(WechatConstants.HEADER_SIGNATURE);
+
+        try {
+            return pipeline.getClient().dataVerify(serialNo, timestamp, nonce, sign, payload);
+        } catch (Exception ex) {
+            LOG.error("Wechat result notify data verify failed", ex);
+            return false;
+        }
+    }
+
+    public static class NotifyResult {
+        private String code;
+        private String message;
+
+        public static NotifyResult success() {
+            NotifyResult result = new NotifyResult();
+            result.code = "SUCCESS";
+            result.message = "SUCCESS";
+            return result;
+        }
+
+        public static NotifyResult failure(String message) {
+            NotifyResult result = new NotifyResult();
+            result.code = "FAILED";
+            result.message = message;
+            return result;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+    }
+
+}
+package com.diligrp.cashier.boss.domain;
+
+import java.util.List;
+
+public class CashierOrderInfo {
+    // 业务系统用户标识
+    private final String userId;
+    // 支付通道
+    private final List<PaymentPipeline> pipelines;
+
+    public CashierOrderInfo(String userId, List<PaymentPipeline> pipelines) {
+        this.userId = userId;
+        this.pipelines = pipelines;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public List<PaymentPipeline> getPipelines() {
+        return pipelines;
+    }
+
+    public static class PaymentPipeline {
+        // 支付通道
+        private final Long pipelineId;
+        // 支付渠道
+        private final Integer channelId;
+
+        public PaymentPipeline(Long pipelineId, Integer channelId) {
+            this.pipelineId = pipelineId;
+            this.channelId = channelId;
+        }
+
+        public Long getPipelineId() {
+            return pipelineId;
+        }
+
+        public Integer getChannelId() {
+            return channelId;
+        }
+    }
+}
@@ -60,7 +60,7 @@ public class CashierOrderToken {
         return Base62Cipher.decodeLong(payload);
     }
-    public static CashierOrderToken decode(String payload) {
+    public static CashierOrderToken decodeCashierOrder(String payload) {
         if (payload != null) {
             return JsonUtils.fromJsonString(payload, CashierOrderToken.class);
         }
 package com.diligrp.cashier.boss.service;
+import com.diligrp.cashier.boss.domain.CashierOrderInfo;
 import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
-import com.diligrp.cashier.trade.domain.CashierOrder;
-import com.diligrp.cashier.trade.domain.CashierPayment;
-import com.diligrp.cashier.trade.domain.Merchant;
+import com.diligrp.cashier.trade.domain.*;
 public interface ICashierDeskService {
     /**
@@ -17,10 +16,36 @@ public interface ICashierDeskService {
     CashierPaymentUrl doSubmit(Merchant merchant, CashierOrder order);
     /**
+     * 根据收银台TOKEN信息获取订单信息
+     */
+    CashierOrderInfo getCashierOrderByToken(String token);
+
+    /**
      * 提交收银台支付
      *
      * @param payment - 支付信息
      * @return 支付状态
      */
     OnlinePaymentStatus doPayment(CashierPayment payment);
+
+    /**
+     * 关闭预支付订单
+     */
+    void closePrepayOrder(String paymentId);
+
+    /**
+     * 查询支付状态
+     */
+    OnlinePaymentResult queryPaymentState(String paymentId, String mode);
+
+    /**
+     * 交易退款
+     */
+    OnlineRefundResult sendRefundRequest(OnlineRefundDTO request);
+
+    /**
+     * 查询退款状态
+     */
+    OnlineRefundResult queryRefundState(String refundId, String mode);
+
 }
@@ -2,19 +2,26 @@ 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.CashierOrderToken;
 import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
+import com.diligrp.cashier.boss.exception.BossServiceException;
 import com.diligrp.cashier.boss.service.ICashierDeskService;
+import com.diligrp.cashier.pipeline.core.PaymentPipeline;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
-import com.diligrp.cashier.trade.domain.CashierOrder;
-import com.diligrp.cashier.trade.domain.CashierPayment;
-import com.diligrp.cashier.trade.domain.Merchant;
-import com.diligrp.cashier.trade.domain.MerchantParams;
+import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
+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.TradeOrder;
 import com.diligrp.cashier.trade.service.ICashierPaymentService;
+import com.diligrp.cashier.trade.service.ITradeAssistantService;
+import com.diligrp.cashier.trade.type.TradeState;
 import jakarta.annotation.Resource;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 @Service("cashierDeskService")
@@ -24,6 +31,12 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     private ICashierPaymentService cashierPaymentService;
     @Resource
+    private ITradeAssistantService tradeAssistantService;
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    @Resource
     private CashierDeskProperties cashierDeskProperties;
     @Resource
@@ -54,6 +67,29 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         return new CashierPaymentUrl(tradeId, paymentUrl);
     }
+    @Override
+    public CashierOrderInfo 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, "收银台订单超时过期，不能支付");
+        }
+
+        CashierOrderToken orderToken = CashierOrderToken.decodeCashierOrder(payload);
+        TradeOrder trade = tradeAssistantService.findByTradeId(orderToken.getTradeId());
+        if (TradeState.isFinished(trade.getState())) {
+            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<CashierOrderInfo.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
+            new CashierOrderInfo.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel().getCode())).toList();
+        return new CashierOrderInfo(orderToken.getUserId(), pipelineList);
+    }
+
     /**
      * 提交收银台支付
      *
@@ -62,10 +98,31 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
      */
     @Override
     public OnlinePaymentStatus doPayment(CashierPayment payment) {
-        return cashierPaymentService.doPayment(payment);
-        // TODO 是否需要删除token
-//        String token = CashierOrderToken.encode(Long.valueOf(payment.getTradeId()), cashierDeskProperties.getSecretKey());
-//        String tokenKey = String.format(Constants.TOKEN_REDIS_KEY, token);
-//        redisTemplate.delete(tokenKey);
+        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);
+        stringRedisTemplate.delete(tokenKey);
+        return paymentStatus;
+    }
+
+    @Override
+    public void closePrepayOrder(String paymentId) {
+        cashierPaymentService.closePrepayOrder(paymentId);
+    }
+
+    @Override
+    public OnlinePaymentResult queryPaymentState(String paymentId, String mode) {
+        return cashierPaymentService.queryPaymentState(paymentId, mode);
+    }
+
+    @Override
+    public OnlineRefundResult sendRefundRequest(OnlineRefundDTO request) {
+        return cashierPaymentService.sendRefundRequest(request);
+    }
+
+    @Override
+    public OnlineRefundResult queryRefundState(String refundId, String mode) {
+        return cashierPaymentService.queryRefundState(refundId, mode);
     }
 }
+package com.diligrp.cashier.boss.util;
+
+import com.diligrp.cashier.boss.Constants;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * HTTP工具类
+ */
+public final class HttpUtils {
+
+    private static final Logger LOG = LoggerFactory.getLogger(HttpUtils.class);
+
+    public static String httpBody(HttpServletRequest request) {
+        StringBuilder payload = new StringBuilder();
+        try {
+            String line;
+            BufferedReader reader = request.getReader();
+            while ((line = reader.readLine()) != null) {
+                payload.append(line);
+            }
+        } catch (IOException iex) {
+            LOG.error("Failed to extract http body", iex);
+        }
+
+        return payload.toString();
+    }
+
+    public static void sendResponse(HttpServletResponse response, String payload) {
+        try {
+            response.setContentType(Constants.CONTENT_TYPE);
+            byte[] responseBytes = payload.getBytes(StandardCharsets.UTF_8);
+            response.setContentLength(responseBytes.length);
+            response.getOutputStream().write(responseBytes);
+            response.flushBuffer();
+        } catch (IOException iex) {
+            LOG.error("Failed to write data packet back");
+        }
+    }
+}
@@ -4,6 +4,7 @@ import com.diligrp.cashier.pipeline.domain.*;
 import com.diligrp.cashier.pipeline.domain.wechat.ErrorMessage;
 import com.diligrp.cashier.pipeline.domain.wechat.WechatConfig;
 import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.pipeline.util.WechatConstants;
 import com.diligrp.cashier.pipeline.util.WechatSignatureUtils;
@@ -130,8 +131,8 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             Map<String, Object> payer = (Map<String, Object>) response.get("payer");
             String openId = payer == null ? null : (String) payer.get("openid");
             PaymentState state = WechatStateUtils.getPaymentState((String) response.get("trade_state"));
-            return OnlinePaymentResponse.of((String) response.get("out_trade_no"), (String) response.get("transaction_id"),
-                openId, when, state, (String) response.get("trade_state_desc"));
+            return new OnlinePaymentResponse((String) response.get("out_trade_no"), (String) response.get("transaction_id"),
+                OutPaymentType.WXPAY, openId, when, state, (String) response.get("trade_state_desc"));
         } else {
             LOG.info("Wechat query transaction status failed: {}", result.statusCode);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
@@ -5,6 +5,7 @@ import com.diligrp.cashier.pipeline.domain.*;
 import com.diligrp.cashier.pipeline.domain.wechat.ErrorMessage;
 import com.diligrp.cashier.pipeline.domain.wechat.WechatConfig;
 import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.pipeline.util.WechatConstants;
 import com.diligrp.cashier.pipeline.util.WechatSignatureUtils;
@@ -134,8 +135,8 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             Map<String, Object> payer = (Map<String, Object>) response.get("payer");
             String openId = payer == null ? null : (String) payer.get("sp_openid"); // 获取服务商APPID下的openId，而非子商户APPID下的openId
             PaymentState state = WechatStateUtils.getPaymentState((String) response.get("trade_state"));
-            return OnlinePaymentResponse.of((String) response.get("out_trade_no"), (String) response.get("transaction_id"),
-                openId, when, state, (String) response.get("trade_state_desc"));
+            return new OnlinePaymentResponse((String) response.get("out_trade_no"), (String) response.get("transaction_id"),
+                OutPaymentType.WXPAY, openId, when, state, (String) response.get("trade_state_desc"));
         } else {
             LOG.info("Wechat query transaction status failed: {}", result.statusCode);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory;
 /**
  * 地利园区卡支付通道模型
  */
-public class DiliCardPipeline extends OnlinePipeline<DiliCardPipeline.CardParams> {
+public class DiliCardPipeline extends PaymentPipeline<DiliCardPipeline.CardParams> {
     private static final Logger LOG = LoggerFactory.getLogger(DiliCardPipeline.class);
@@ -18,21 +18,6 @@ public class OnlinePaymentResponse extends OnlinePaymentStatus {
     // 交易备注
     private final String message;
-    public static OnlinePaymentResponse of(String paymentId, String outTradeNo, LocalDateTime when,
-                                           PaymentState state, String message) {
-        return new OnlinePaymentResponse(paymentId, outTradeNo, null, null, when, state, message);
-    }
-
-    public static OnlinePaymentResponse of(String paymentId, String outTradeNo, String payerId,
-                                           LocalDateTime when, PaymentState state, String message) {
-        return new OnlinePaymentResponse(paymentId, outTradeNo, null, payerId, when, state, message);
-    }
-
-    public static OnlinePaymentResponse of(String paymentId, String outTradeNo, OutPaymentType outPayType,
-                                           LocalDateTime when, PaymentState state, String message) {
-        return new OnlinePaymentResponse(paymentId, outTradeNo, outPayType, null, when, state, message);
-    }
-
     public OnlinePaymentResponse(String paymentId, String outTradeNo, OutPaymentType outPayType,
                                  String payerId, LocalDateTime when, PaymentState state, String message) {
         super(paymentId, outTradeNo, state);
@@ -8,7 +8,8 @@ import java.time.LocalDateTime;
 public class CardPaymentResponse extends OnlinePaymentResponse {
-    public CardPaymentResponse(String paymentId, String outTradeNo, OutPaymentType outPayType, String payerId, LocalDateTime when, PaymentState state, String message) {
+    public CardPaymentResponse(String paymentId, String outTradeNo, OutPaymentType outPayType, String payerId,
+                               LocalDateTime when, PaymentState state, String message) {
         super(paymentId, outTradeNo, outPayType, payerId, when, state, message);
     }
 }
+package com.diligrp.cashier.pipeline.service;
+
+import com.diligrp.cashier.pipeline.domain.wechat.UploadShippingRequest;
+
+public interface IWechatPaymentService {
+    /**
+     * 根据登陆凭证code获取openId
+     */
+    String openIdByCode(Long pipelineId, String code);
+
+    /**
+     *  通知微信发货
+     *  服务商模式下，解决买家微信付款成功，卖家微信商户号无法收到钱，需要去自己的微信后台操作一下【发货】
+     */
+    void deliverGoods(Long pipelineId, UploadShippingRequest request);
+}
+package com.diligrp.cashier.pipeline.service.impl;
+
+import com.diligrp.cashier.pipeline.client.WechatHttpClient;
+import com.diligrp.cashier.pipeline.core.WechatPartnerPipeline;
+import com.diligrp.cashier.pipeline.core.WechatPipeline;
+import com.diligrp.cashier.pipeline.domain.wechat.UploadShippingRequest;
+import com.diligrp.cashier.pipeline.domain.wechat.WechatAccessToken;
+import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
+import com.diligrp.cashier.pipeline.service.IWechatPaymentService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+@Service("wechatPaymentService")
+public class WechatPaymentServiceImpl implements IWechatPaymentService {
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    /**
+     * 根据登陆凭证code获取openId
+     */
+    @Override
+    public String openIdByCode(Long pipelineId, String code) {
+        WechatPipeline pipeline = paymentPipelineManager.findPipelineById(pipelineId, WechatPipeline.class);
+        return pipeline.getClient().loginAuthorization(code);
+    }
+
+    /**
+     *  通知微信发货
+     *  服务商模式下，解决买家微信付款成功，卖家微信商户号无法收到钱，需要去自己的微信后台操作一下【发货】
+     */
+    @Override
+    public void deliverGoods(Long pipelineId, UploadShippingRequest request) {
+        WechatPartnerPipeline pipeline = paymentPipelineManager.findPipelineById(pipelineId, WechatPartnerPipeline.class);
+        // 获取微信接口登录凭证，并调用微信发货信息录入接口
+        WechatHttpClient client = pipeline.getClient();
+        WechatAccessToken accessToken = client.getAccessToken();
+        client.sendUploadShippingRequest(request, accessToken.getToken());
+    }
+}
@@ -46,14 +46,6 @@ public enum PaymentState implements IEnumType {
         return Arrays.asList(PaymentState.values());
     }
-    public static boolean isPending(int code) {
-        return PaymentState.PENDING.equalTo(code);
-    }
-
-    public static boolean isProcessing(int code) {
-        return PaymentState.PROCESSING.equalTo(code);
-    }
-
     public static boolean isFinished(int code) {
         return PaymentState.SUCCESS.equalTo(code) || PaymentState.FAILED.equalTo(code);
     }
 package com.diligrp.cashier.shared.spi;
-@FunctionalInterface
 public interface IPaymentEventListener {
     void onEvent(PaymentEvent event);
+
+    void onEvent(RefundEvent event);
 }
@@ -3,8 +3,10 @@ package com.diligrp.cashier.shared.spi;
 import java.time.LocalDateTime;
 public class PaymentEvent {
-    // 支付ID
+    // 交易号
     private final String tradeId;
+    // 支付ID
+    private final String paymentId;
     // 支付状态
     private final Integer state;
     // 业务系统订单号
@@ -18,8 +20,10 @@ public class PaymentEvent {
     // 交易描述
     private final String message;
-    public PaymentEvent(String tradeId, int state, String outTradeNo, Integer outPayType, String payerId, LocalDateTime when, String message) {
+    public PaymentEvent(String tradeId, String paymentId, int state, String outTradeNo, Integer outPayType,
+                        String payerId, LocalDateTime when, String message) {
         this.tradeId = tradeId;
+        this.paymentId = paymentId;
         this.state = state;
         this.outTradeNo = outTradeNo;
         this.outPayType = outPayType;
@@ -32,6 +36,10 @@ public class PaymentEvent {
         return tradeId;
     }
+    public String getPaymentId() {
+        return paymentId;
+    }
+
     public Integer getState() {
         return state;
     }
+package com.diligrp.cashier.shared.spi;
+
+import java.time.LocalDateTime;
+
+public class RefundEvent {
+    // 退款单号
+    private final String refundId;
+    // 原支付ID
+    private final String tradeId;
+    // 支付状态
+    private final Integer state;
+    // 发生时间
+    private final LocalDateTime when;
+    // 交易描述
+    private final String message;
+
+    public RefundEvent(String refundId, String tradeId, int state, LocalDateTime when, String 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;
+    }
+}
@@ -2,6 +2,15 @@ package com.diligrp.cashier.trade;
 public final class Constants {
+    // 支付通道延时队列
+    public static final String PAYMENT_DELAY_QUEUE = "cashier.payment.delayQueue";
+
+    // 支付通道延时交换机
+    public static final String PAYMENT_DELAY_EXCHANGE = "cashier.payment.delayExchange";
+
+    // 支付通道延时路由KEY
+    public static final String PAYMENT_DELAY_KEY = "cashier.payment.delayKey";
+
     // 默认订单超时时间-秒, 十分钟
     public static final int DEFAULT_ORDER_TIMEOUT_SECONDS = 10 * 60 * 1000;
@@ -14,10 +23,4 @@ public final class Constants {
     // 支付订单分布式锁超时时长-秒
     public static final int TRADE_LOCK_TIMEOUT_SECONDS = 15 * 1000;
-    // 微信支付openId参数
-    private static final String PARAM_OPEN_ID = "openId";
-
-    // 微信服务商模式下mchId子商户号参数
-    public static final String PARAM_MCH_ID = "mchId";
-
 }
@@ -2,11 +2,45 @@ package com.diligrp.cashier.trade;
 import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.amqp.core.Binding;
+import org.springframework.amqp.core.BindingBuilder;
+import org.springframework.amqp.core.CustomExchange;
+import org.springframework.amqp.core.Queue;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import java.util.HashMap;
+import java.util.Map;
+
 @Configuration
 @ComponentScan("com.diligrp.cashier.trade")
 @MapperScan(basePackages =  {"com.diligrp.cashier.trade.dao"}, markerInterface = MybatisMapperSupport.class)
 public class TradeConfiguration {
+    /**
+     * 支付通道MQ延时队列
+     * 队列为持久化、非独占式且不自动删除的队列, 利用RabbitMQ延时插件实现延时功能https://github.com/rabbitmq/rabbitmq-delayed-message-exchange
+     */
+    @Bean
+    public Queue paymentDelayQueue() {
+        return new Queue(Constants.PAYMENT_DELAY_QUEUE, true, false, false);
+    }
+
+    /**
+     * 支付通道MQ延时交换机
+     */
+    @Bean
+    public CustomExchange paymentDelayExchange() {
+        Map<String, Object> arguments = new HashMap<>();
+        arguments.put("x-delayed-type", "direct");
+        return new CustomExchange(Constants.PAYMENT_DELAY_EXCHANGE, "x-delayed-message", true, false, arguments);
+    }
+
+    /**
+     * 支付通道MQ延时队列和交换机的绑定
+     */
+    @Bean
+    public Binding paymentDelayBinding() {
+        return BindingBuilder.bind(paymentDelayQueue()).to(paymentDelayExchange()).with(Constants.PAYMENT_DELAY_KEY).noargs();
+    }
 }
@@ -21,5 +21,6 @@ public interface IOnlinePaymentDao extends MybatisMapperSupport {
     int compareAndSetState(PaymentStateDTO paymentDTO);
-    List<OnlinePayment> findByTradeId(@Param("tradeId") String tradeId, @Param("state") Integer state);
+    List<OnlinePayment> listOnlinePayments(@Param("tradeId") String tradeId, @Param("type") Integer type,
+                                           @Param("state") Integer state);
 }
+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 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;
+        return new OnlinePaymentResult(tradeId, paymentId, state.getCode(), outTradeNo, outPayTypeCode, payerId, when, message);
+    }
+
+    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);
+    }
+}
+package com.diligrp.cashier.trade.domain;
+
+/**
+ * 退款申请
+ */
+public class OnlineRefundDTO {
+    // 原支付号
+    private String tradeId;
+    // 退款金额
+    private Long amount;
+    // 回调地址
+    private String notifyUri;
+    // 退款原因
+    private String description;
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public String getNotifyUri() {
+        return notifyUri;
+    }
+
+    public void setNotifyUri(String notifyUri) {
+        this.notifyUri = notifyUri;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
+package com.diligrp.cashier.trade.domain;
+
+import com.diligrp.cashier.shared.spi.RefundEvent;
+
+import java.time.LocalDateTime;
+
+/**
+ * 退款结果
+ */
+public class OnlineRefundResult extends RefundEvent {
+    public OnlineRefundResult(String refundId, String tradeId, int state, LocalDateTime when, String message) {
+        super(refundId, tradeId, state, when, message);
+    }
+}
@@ -116,7 +116,7 @@ public class PaymentStateDTO {
         }
         public Builder outPayType(OutPaymentType outPayType) {
-            PaymentStateDTO.this.outPayType = outPayType.getCode();
+            PaymentStateDTO.this.outPayType = outPayType != null ? outPayType.getCode() : null;
             return this;
         }
@@ -135,6 +135,11 @@ public class PaymentStateDTO {
             return this;
         }
+        public Builder state(Integer state) {
+            PaymentStateDTO.this.state = state;
+            return this;
+        }
+
         public Builder description(String description) {
             PaymentStateDTO.this.description = description;
             return this;
+package com.diligrp.cashier.trade.domain;
+
+import com.diligrp.cashier.shared.util.JsonUtils;
+
+/**
+ * 异步消息模型
+ */
+public class TaskMessage {
+    // 收银台订单扫描，在固定周期后兜底处理预支付订单；
+    // 查询交易订单的支付状态，根据支付状态完成交易订单，或关闭交易订单
+    public static final int TYPE_CASHIER_ORDER_SCAN = 10;
+    // 周期性查询退款状态
+    public static final int TYPE_CASHIER_REFUND_SCAN = 20;
+
+    // 消息类型
+    private int type;
+    // 消息体
+    private String payload;
+    // 消息参数
+    private String params;
+
+    public TaskMessage() {
+    }
+
+    public TaskMessage(int type, String payload, String params) {
+        this.type = type;
+        this.payload = payload;
+        this.params = params;
+    }
+
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getPayload() {
+        return payload;
+    }
+
+    public void setPayload(String payload) {
+        this.payload = payload;
+    }
+
+    public String getParams() {
+        return params;
+    }
+
+    public void setParams(String params) {
+        this.params = params;
+    }
+
+    public static TaskMessage of(int type, String payload) {
+        return of(type, payload, null);
+    }
+
+    public static TaskMessage of(int type, String payload, String params) {
+        return new TaskMessage(type, payload, params);
+    }
+
+    public static TaskMessage fromJson(String json) {
+        return JsonUtils.fromJsonString(json, TaskMessage.class);
+    }
+
+    @Override
+    public String toString() {
+        return JsonUtils.toJsonString(this);
+    }
+}
-package com.diligrp.cashier.trade.domain;
-
-import com.diligrp.cashier.shared.spi.PaymentEvent;
-
-import java.time.LocalDateTime;
-
-/**
- * 在线支付结果 - 用于业务系统支付结果通知
- */
-public class TradePaymentResult extends PaymentEvent {
-    public TradePaymentResult(String tradeId, int state, String outTradeNo, Integer outPayType, String payerId,
-                              LocalDateTime when, String message) {
-        super(tradeId, state, outTradeNo, outPayType, payerId, when, message);
-    }
-}
@@ -19,6 +19,22 @@ public class TradeStateDTO {
     // 修改时间
     private LocalDateTime modifiedTime;
+    public static TradeStateDTO of(String tradeId, TradeState state, Integer version, LocalDateTime modifiedTime) {
+        return new TradeStateDTO(tradeId, null, state.getCode(), version, modifiedTime);
+    }
+
+    public static TradeStateDTO of(String tradeId, Long amount, TradeState state, Integer version, LocalDateTime modifiedTime) {
+        return new TradeStateDTO(tradeId, amount, state.getCode(), version, modifiedTime);
+    }
+
+    public TradeStateDTO(String tradeId, Long amount, Integer state, Integer version, LocalDateTime modifiedTime) {
+        this.tradeId = tradeId;
+        this.amount = amount;
+        this.state = state;
+        this.version = version;
+        this.modifiedTime = modifiedTime;
+    }
+
     public String getTradeId() {
         return tradeId;
     }
@@ -58,18 +74,4 @@ public class TradeStateDTO {
     public void setModifiedTime(LocalDateTime modifiedTime) {
         this.modifiedTime = modifiedTime;
     }
-
-    public static TradeStateDTO of(String tradeId, TradeState state, Integer version, LocalDateTime modifiedTime) {
-        return of(tradeId, null, state, version, modifiedTime);
-    }
-
-    public static TradeStateDTO of(String tradeId, Long amount, TradeState state, Integer version, LocalDateTime modifiedTime) {
-        TradeStateDTO tradeStateDTO = new TradeStateDTO();
-        tradeStateDTO.tradeId = tradeId;
-        tradeStateDTO.amount = amount;
-        tradeStateDTO.state = state.getCode();
-        tradeStateDTO.version = version;
-        tradeStateDTO.modifiedTime = modifiedTime;
-        return tradeStateDTO;
-    }
 }
 \ No newline at end of file
@@ -5,7 +5,8 @@ import com.diligrp.cashier.shared.service.ThreadPoolService;
 import com.diligrp.cashier.shared.spi.IPaymentEventListener;
 import com.diligrp.cashier.shared.util.JsonUtils;
 import com.diligrp.cashier.shared.util.ObjectUtils;
-import com.diligrp.cashier.trade.domain.TradePaymentResult;
+import com.diligrp.cashier.trade.domain.OnlineRefundResult;
+import com.diligrp.cashier.trade.domain.OnlinePaymentResult;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,7 +26,7 @@ public class PaymentResultManager {
     /**
      * 通知业务系统在线支付通道处理结果
      */
-    public void notifyPaymentResult(String uri, TradePaymentResult payload) {
+    public void notifyPaymentResult(String uri, OnlinePaymentResult payload) {
         ThreadPoolService.getIoThreadPoll().submit(() -> {
             List<IPaymentEventListener> lifeCycles = eventListeners.stream().toList();
             for (IPaymentEventListener listener : lifeCycles) {
@@ -55,6 +56,39 @@ public class PaymentResultManager {
         });
     }
+    /**
+     * 通知业务系统退款处理结果
+     */
+    public void notifyRefundResult(String uri, OnlineRefundResult payload) {
+        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 (ObjectUtils.isEmpty(uri)) {
+            return;
+        }
+
+        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);
+                if (httpResult.statusCode != 200) {
+                    LOG.error("Failed to notify trade refund result");
+                }
+            } catch (Exception ex) {
+                LOG.error("Failed to notify trade refund result", ex);
+            }
+        });
+    }
+
     private static class NotifyHttpClient extends ServiceEndpointSupport {
         private final String baseUrl;
+package com.diligrp.cashier.trade.manager;
+
+import com.diligrp.cashier.shared.util.NumberUtils;
+import com.diligrp.cashier.trade.Constants;
+import com.diligrp.cashier.trade.domain.TaskMessage;
+import com.diligrp.cashier.trade.service.ICashierAssistantService;
+import jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageProperties;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
+import java.nio.charset.StandardCharsets;
+
+@Service("taskMessageConsumer")
+public class TaskMessageConsumer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TaskMessageConsumer.class);
+
+    @Resource
+    private ICashierAssistantService cashierAssistantService;
+
+    /**
+     * 监听支付通道异步处理任务消息
+     */
+    @RabbitHandler
+    @RabbitListener(queues = {Constants.PAYMENT_DELAY_QUEUE})
+    public void onDelayMessage(Message message) {
+        byte[] packet = message.getBody();
+        MessageProperties properties = message.getMessageProperties();
+        String charSet = properties != null && properties.getContentEncoding() != null
+                ? properties.getContentEncoding() : StandardCharsets.UTF_8.name();
+        try {
+            String body = new String(packet, charSet);
+            LOG.info("Receiving online pipeline async task request: {}", body);
+            TaskMessage task = TaskMessage.fromJson(body);
+            int times = NumberUtils.str2Int(task.getParams(), Integer.MAX_VALUE);
+            if (task.getType() == TaskMessage.TYPE_CASHIER_ORDER_SCAN) {
+                cashierAssistantService.scanCashierTradeOrder(task.getPayload(), times);
+            } else if (task.getType() == TaskMessage.TYPE_CASHIER_REFUND_SCAN) {
+                cashierAssistantService.scanCashierRefundOrder(task.getPayload(), times);
+            } else {
+                LOG.error("Never happened");
+            }
+        } catch (Exception ex) {
+            LOG.error("Consume online pipeline async message exception", ex);
+        }
+    }
+}
+package com.diligrp.cashier.trade.manager;
+
+import com.diligrp.cashier.shared.service.ThreadPoolService;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import com.diligrp.cashier.trade.Constants;
+import com.diligrp.cashier.trade.domain.TaskMessage;
+import jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageProperties;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.stereotype.Service;
+
+import java.nio.charset.StandardCharsets;
+
+@Service("taskMessageSender")
+public class TaskMessageSender {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TaskMessageSender.class);
+
+    private static final long ONE_MINUTE = 60 * 1000;
+
+    private static final long TEN_MINUTES = 10 * ONE_MINUTE;
+
+    private static final long ONE_SECOND = 1000;
+
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
+    /**
+     * 发送延时处理消息
+     */
+    public void sendDelayTaskMessage(TaskMessage task, long delayInMillis) {
+        if (delayInMillis < 0) {
+            LOG.info("No need send scan order message[type={}]", task.getType());
+            return;
+        }
+
+        ThreadPoolService.getIoThreadPoll().submit(() -> {
+            try {
+                MessageProperties properties = new MessageProperties();
+                properties.setContentEncoding(StandardCharsets.UTF_8.name());
+                properties.setContentType(MessageProperties.CONTENT_TYPE_BYTES);
+                // properties.setExpiration(String.valueOf(expiredTime));
+                // RabbitMQ延时插件必须设置x-delay的header才能生效
+                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());
+                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);
+            }
+        });
+    }
+}
@@ -40,6 +40,8 @@ public class OnlinePayment extends BaseDO {
     private Integer outPayType;
     // 申请状态
     private Integer state;
+    // 业务回调地址
+    private String notifyUrl;
     // 备注
     private String description;
@@ -163,6 +165,14 @@ public class OnlinePayment extends BaseDO {
         this.state = state;
     }
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -201,11 +211,21 @@ public class OnlinePayment extends BaseDO {
             return this;
         }
+        public Builder channelId(Integer channelType) {
+            OnlinePayment.this.channelId = channelType;
+            return this;
+        }
+
         public Builder payType(PaymentType payType) {
             OnlinePayment.this.payType = payType.getCode();
             return this;
         }
+        public Builder payType(Integer payType) {
+            OnlinePayment.this.payType = payType;
+            return this;
+        }
+
         public Builder pipelineId(Long pipelineId) {
             OnlinePayment.this.pipelineId = pipelineId;
             return this;
@@ -246,11 +266,26 @@ public class OnlinePayment extends BaseDO {
             return this;
         }
+        public Builder outPayType(Integer outPayType) {
+            OnlinePayment.this.outPayType = outPayType;
+            return this;
+        }
+
         public Builder state(PaymentState state) {
             OnlinePayment.this.state = state.getCode();
             return this;
         }
+        public Builder state(Integer state) {
+            OnlinePayment.this.state = state;
+            return this;
+        }
+
+        public Builder notifyUrl(String notifyUrl) {
+            OnlinePayment.this.notifyUrl = notifyUrl;
+            return this;
+        }
+
         public Builder description(String description) {
             OnlinePayment.this.description = description;
             return this;
+package com.diligrp.cashier.trade.service;
+
+public interface ICashierAssistantService {
+    /**
+     * 扫描收银台交易订单
+     */
+    void scanCashierTradeOrder(String tradeId, int times);
+
+    /**
+     * 兜底处理退款订单
+     */
+    void scanCashierRefundOrder(String refundId, int times);
+}
 package com.diligrp.cashier.trade.service;
+import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
 import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
-import com.diligrp.cashier.trade.domain.CashierOrder;
-import com.diligrp.cashier.trade.domain.CashierPayment;
-import com.diligrp.cashier.trade.domain.Merchant;
+import com.diligrp.cashier.pipeline.domain.OnlineRefundResponse;
+import com.diligrp.cashier.trade.domain.*;
 public interface ICashierPaymentService {
     /**
      * 提交收银台订单
      *
-     * @param  merchant - 接入商户
+     * @param merchant     - 接入商户
      * @param cashierOrder - 订单申请
      * @return 支付ID
      */
@@ -22,4 +22,38 @@ public interface ICashierPaymentService {
      * @return 支付状态
      */
     OnlinePaymentStatus doPayment(CashierPayment cashierPayment);
+
+    /**
+     * 支付结果通知
+     *
+     * @param response - 支付结果
+     */
+    void notifyPaymentResponse(OnlinePaymentResponse response);
+
+    /**
+     * 关闭预支付订单
+     */
+    void closePrepayOrder(String paymentId);
+
+    /**
+     * 查询交易订单状态
+     */
+    OnlinePaymentResult queryPaymentState(String paymentId, String mode);
+
+    /**
+     * 支付退款申请
+     */
+    OnlineRefundResult sendRefundRequest(OnlineRefundDTO request);
+
+    /**
+     * 退款结果通知
+     *
+     * @param response - 退款结果
+     */
+    void notifyRefundResult(OnlineRefundResponse response);
+
+    /**
+     * 查询退款状态
+     */
+    OnlineRefundResult queryRefundState(String refundId, String mode);
 }
-package com.diligrp.cashier.trade.service;
-
-public interface IPaymentAssistantService {
-}
@@ -5,6 +5,9 @@ import com.diligrp.cashier.trade.domain.TradeStateDTO;
 import com.diligrp.cashier.trade.model.OnlinePayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
+import java.util.List;
+import java.util.Optional;
+
 public interface ITradeAssistantService {
     /**
@@ -32,4 +35,8 @@ public interface ITradeAssistantService {
      */
     void proceedOnlinePayment(PaymentStateDTO paymentDTO);
+    /**
+     * 查询退款订单
+     */
+    OnlinePayment findByRefundId(String refundId);
 }
+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;
+import com.diligrp.cashier.pipeline.domain.OnlinePrepayOrder;
+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.dao.IOnlinePaymentDao;
+import com.diligrp.cashier.trade.domain.TradeStateDTO;
+import com.diligrp.cashier.trade.model.OnlinePayment;
+import com.diligrp.cashier.trade.model.TradeOrder;
+import com.diligrp.cashier.trade.service.ICashierAssistantService;
+import com.diligrp.cashier.trade.service.ICashierPaymentService;
+import com.diligrp.cashier.trade.type.TradeState;
+import com.diligrp.cashier.trade.type.TradeType;
+import jakarta.annotation.Resource;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service("cashierAssistantService")
+public class CashierAssistantServiceImpl implements ICashierAssistantService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(CashierAssistantServiceImpl.class);
+
+    @Resource
+    private IOnlinePaymentDao onlinePaymentDao;
+
+    @Resource
+    private ICashierPaymentService cashierPaymentService;
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    @Resource
+    private TradeAssistantServiceImpl tradeAssistantService;
+
+    @Resource
+    private RedissonClient redissonClient;
+
+    @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);
+        RLock lock = redissonClient.getLock(lockKey);
+        try {
+            lock.lock();
+            LocalDateTime now = LocalDateTime.now();
+            // 理论上只会存在一条支付中的支付订单
+            List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(tradeId,
+                TradeType.TRADE.getCode(), PaymentState.PROCESSING.getCode());
+            // 关闭所有未支付完成的支付订单
+            for (OnlinePayment payment : onlinePayments) {
+                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
+                // 在线支付通道才能关闭订单, 园区卡支付不支持
+                if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                    OnlinePrepayOrder order = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
+                    // 微信服务商模式，还需子商户
+                    order.attach(Constants.PARAM_MCH_ID, payment.getOutMchId());
+                    OnlinePaymentResponse response = onlinePipeline.queryPrepayResponse(order);
+                    if (!PaymentState.isFinished(response.getState().getCode())) {
+                        try {
+                            onlinePipeline.closePrepayOrder(order);
+                            LOG.debug("scanCashierTradeOrder: close online prepay order {}", payment.getPaymentId());
+                            response = new OnlinePaymentResponse(response.getPaymentId(), response.getOutTradeNo(),
+                                response.getOutPayType(), response.getPayerId(), response.getWhen(),
+                                PaymentState.FAILED, "自动关闭超时的支付订单");
+                        } catch (Exception ex) {
+                            LOG.error("scanOnlinePrepayOrder: close online prepare order exception", ex);
+                        }
+                    }
+                    cashierPaymentService.notifyPaymentResponse(response);
+                }
+            }
+            // 交易订单仍然未完成则关闭交易订单，交易订单不能继续支付
+            TradeOrder trade = tradeAssistantService.findByTradeId(tradeId);
+            if (!TradeState.isFinished(trade.getState())) {
+                TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.FAILED, trade.getVersion(), now);
+                tradeAssistantService.proceedTradeOrder(tradeStateDTO);
+            }
+        } finally {
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+
+    @Override
+    public void scanCashierRefundOrder(String refundId, int times) {
+        LOG.debug("scanCashierRefundOrder{}: processing online refund order {}", times, refundId);
+        OnlinePayment refund = tradeAssistantService.findByRefundId(refundId);
+        if (PaymentState.isFinished(refund.getState())) {
+            LOG.debug("scanCashierRefundOrder{}: online refund order {} already accomplished", times, refundId);
+            return;
+        }
+
+        OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), OnlinePipeline.class);
+        OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
+        // 微信服务商模式，还需子商户
+        order.attach(Constants.PARAM_MCH_ID, refund.getOutMchId());
+        OnlineRefundResponse response = pipeline.queryRefundResponse(order);
+        cashierPaymentService.notifyRefundResult(response);
+    }
+}
 package com.diligrp.cashier.trade.service.impl;
+import com.diligrp.cashier.assistant.service.KeyGenerator;
 import com.diligrp.cashier.assistant.service.impl.SnowflakeKeyManager;
 import com.diligrp.cashier.pipeline.core.DiliCardPipeline;
 import com.diligrp.cashier.pipeline.core.OnlinePipeline;
 import com.diligrp.cashier.pipeline.core.PaymentPipeline;
-import com.diligrp.cashier.pipeline.domain.MiniProPrepayRequest;
-import com.diligrp.cashier.pipeline.domain.MiniProPrepayResponse;
-import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
+import com.diligrp.cashier.pipeline.core.WechatPipeline;
+import com.diligrp.cashier.pipeline.domain.*;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentRequest;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentResponse;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
@@ -20,6 +20,7 @@ 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.model.OnlinePayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
@@ -33,6 +34,8 @@ import com.diligrp.cashier.trade.util.MiniProPaymentConverter;
 import jakarta.annotation.Resource;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +46,8 @@ import java.util.concurrent.TimeUnit;
 @Service("cashierPaymentService")
 public class CashierPaymentServiceImpl implements ICashierPaymentService {
+    private static final Logger LOG = LoggerFactory.getLogger(CashierPaymentServiceImpl.class);
+
     @Resource
     private ITradeOrderDao tradeOrderDao;
@@ -56,6 +61,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     private IPaymentPipelineManager paymentPipelineManager;
     @Resource
+    private TaskMessageSender taskMessageSender;
+
+    @Resource
     private PaymentResultManager paymentResultManager;
     @Resource
@@ -86,7 +94,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         tradeOrderDao.insertTradeOrder(tradeOrder);
         // TODO: userId是否需要存储
-        // TODO: 如果不打开收银台支付，定时关闭订单
+        // 兜底处理交易订单，根据支付结果选择关闭或完成交易订单
+        TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_ORDER_SCAN, tradeId, "1");
+        taskMessageSender.sendDelayTaskMessage(message, timeout);
         return tradeId;
     }
@@ -99,77 +109,76 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public OnlinePaymentStatus doPayment(CashierPayment cashierPayment) {
-        // TODO: 防重复提交
+        // TODO: 接口防重复提交
         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);
             if (locked) {
-                TradeOrder tradeOrder = tradeAssistantService.findByTradeId(cashierPayment.getTradeId());
-                CashierType cashierType = CashierType.getByCode(tradeOrder.getType());
-                if (TradeState.isFinished(tradeOrder.getState())) {
-                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "该交易订单已经完成，不能进行支付");
+                TradeOrder trade = tradeAssistantService.findByTradeId(cashierPayment.getTradeId());
+                CashierType cashierType = CashierType.getByCode(trade.getType());
+                if (TradeState.isFinished(trade.getState())) {
+                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行支付, 交易订单已经完成");
+                }
+                // 目前只支持小程序收银台，后期将支持其他收银台类型
+                if (cashierType != CashierType.MINIPRO) {
+                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "系统当前不支持的此收银台类型");
                 }
                 // 关闭支付中的支付订单, 避免一个交易订单存在多笔支付订单, 造成重复支付
-                if (!tradeAssistantService.resetTradeOrder(tradeOrder)) {
-                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "存在支付中的支付申请");
+                if (!tradeAssistantService.resetTradeOrder(trade)) {
+                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行支付, 交易订单正在支付中");
                 }
                 LocalDateTime now = LocalDateTime.now();
                 // 获取支付通道
-                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(cashierPayment.getPipelineId(), PaymentPipeline.class);
+                PaymentPipeline<?> paymentPipeline = paymentPipelineManager.findPipelineById(
+                    cashierPayment.getPipelineId(), PaymentPipeline.class);
                 String paymentId = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID).nextId();
-                if (pipeline instanceof DiliCardPipeline cardPipeline) {
+                if (paymentPipeline instanceof OnlinePipeline<?> pipeline) { // 在线支付通道
+                    // 在线支付通道: 不同的收银台类型使用不同的支付方式(目前只支持小程序收银台)
+                    // 小程序收银台将使用在线支付通道的小程序支付
+                    MiniProPrepayRequest request = new MiniProPaymentConverter(trade, paymentId, now).convert(cashierPayment);
+                    MiniProPrepayResponse response = pipeline.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())
+                        .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) { // 园区卡支付通道
                     // 园区卡支付通道: 所有的收银台类型使用的是同一种园区卡支付流程
-                    // 检查园区卡支付参数
-                    CardPaymentRequest request = new CardPaymentConverter(tradeOrder, paymentId, now).convert(cashierPayment);
+                    CardPaymentRequest request = new CardPaymentConverter(trade, paymentId, now).convert(cashierPayment);
                     // 修改支付状态为支付中，防止重复支付
-                    CardPaymentResponse response = cardPipeline.sendPaymentRequest(request);
+                    CardPaymentResponse response = pipeline.sendPaymentRequest(request);
                     if (PaymentState.isFinished(response.getState().getCode())) {
                         // 园区卡支付通道outMchId为市场ID
-                        String outMchId = cardPipeline.params().getOutMchId();
-                        OnlinePayment payment = OnlinePayment.builder().outMchId(outMchId).tradeId(tradeOrder.getTradeId())
+                        String outMchId = pipeline.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(tradeOrder.getGoods())
-                            .amount(tradeOrder.getAmount()).payerId(response.getPayerId())
+                            .payType(PaymentType.DIRECT).pipelineId(pipeline.pipelineId()).goods(trade.getGoods())
+                            .amount(trade.getAmount()).payerId(response.getPayerId())
                             .finishTime(response.getWhen()).outTradeNo(response.getOutTradeNo())
-                            .outPayType(OutPaymentType.DILICARD).state(response.getState())
+                            .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(tradeOrder.getTradeId(), TradeState.SUCCESS,
-                            tradeOrder.getVersion(), now);
-                        tradeAssistantService.proceedTradeOrder(tradeStateDTO);
-                        // 通知业务系统支付结果
-                        TradePaymentResult paymentResult = new TradePaymentResult(tradeOrder.getTradeId(),
-                            response.getState().getCode(), tradeOrder.getOutTradeNo(), OutPaymentType.DILICARD.getCode(),
-                            response.getPayerId(), response.getWhen(), response.getMessage());
-                        paymentResultManager.notifyPaymentResult(tradeOrder.getNotifyUrl(), paymentResult);
-                    }
-                    return response;
-                } else if (pipeline instanceof OnlinePipeline<?>  onlinePipeline) {
-                    // 在线支付通道: 不同的收银台类型使用的支付方式不同
-                    if (cashierType == CashierType.MINIPRO) {
-                        // 小程序支付收银台使用小程序支付
-                        MiniProPrepayRequest request = new MiniProPaymentConverter(tradeOrder, paymentId, now).convert(cashierPayment);
-                        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(tradeOrder.getTradeId())
-                            .type(TradeType.TRADE).paymentId(paymentId).channelId(pipeline.supportedChannel())
-                            .payType(PaymentType.MINI_PRO).pipelineId(pipeline.pipelineId()).goods(tradeOrder.getGoods())
-                            .amount(tradeOrder.getAmount()).payerId(request.getOpenId()).outTradeNo(response.getOutTradeNo())
-                            .state(response.getState()).version(0).createdTime(now).modifiedTime(now).build();
-                        onlinePaymentDao.insertOnlinePayment(payment);
-                        TradeStateDTO tradeStateDTO = TradeStateDTO.of(tradeOrder.getTradeId(), TradeState.PROCESSING,
-                            tradeOrder.getVersion(), now);
-                        tradeAssistantService.proceedTradeOrder(tradeStateDTO);
-                        return response;
-                    } else {
-                        throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不支持的收银台类型");
+                        // 只有成功才修改交易订单状态，此时交易订单仍然可以继续支付
+                        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);
+                        }
                     }
+                    return response;
                 } else {
                     // 目前只有两类支付通道: CardPipeline和OnlinePipeline, 程序逻辑不应该到达此代码块
                     throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不支持的支付通道类型");
@@ -187,4 +196,240 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             }
         }
     }
+
+    /**
+     * 通知支付结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    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());
+            return;
+        }
+        LOG.info("Processing payment result notification: [{},{}]", payment.getPaymentId(), response.getState());
+
+        if (PaymentState.isFinished(response.getState().getCode())) {
+            LocalDateTime now = LocalDateTime.now();
+            String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, payment.getTradeId());
+            RLock lock = redissonClient.getLock(lockKey);
+            try {
+                lock.lock();
+                TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
+                PaymentStateDTO paymentDTO = PaymentStateDTO.builder().paymentId(payment.getPaymentId())
+                    .outTradeNo(response.getOutTradeNo()).outPayType(response.getOutPayType()).payerId(response.getPayerId())
+                    .finishTime(response.getWhen()).state(response.getState()).description(response.getMessage())
+                    .version(payment.getVersion()).modifiedTime(now).build();
+                tradeAssistantService.proceedOnlinePayment(paymentDTO);
+
+                // 交易订单未完成，支付订单成功支付时处理交易订单，并通知业务系统支付结果；如果支付订单支付失败，收银台交易订单可以继续支付
+                if (TradeState.PENDING.equalTo(trade.getState()) && PaymentState.SUCCESS == response.getState()) {
+                    TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.SUCCESS, trade.getVersion(), now);
+                    tradeAssistantService.proceedTradeOrder(tradeStateDTO);
+
+                    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);
+                }
+            } finally {
+                if (lock.isHeldByCurrentThread()) {
+                    lock.unlock();
+                }
+            }
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void closePrepayOrder(String paymentId) {
+        OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
+        if (PaymentState.isFinished(payment.getState())) {
+            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能关闭预支付订单: 无效的订单状态");
+        }
+
+        String lockKey = String.format(Constants.TRADE_LOCK_REDIS_KEY, payment.getTradeId());
+        RLock lock = redissonClient.getLock(lockKey);
+        try {
+            lock.lock();
+
+            LocalDateTime now = LocalDateTime.now();
+            TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
+            PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
+            // 只有在线支付通道才可以关闭支付订单，园区卡支付不支持
+            if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                OnlinePrepayOrder order = new OnlinePrepayOrder(paymentId, payment.getOutTradeNo());
+                // 用于微信服务商模式下，微信子商户信息
+                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
+                onlinePipeline.closePrepayOrder(order);
+                PaymentStateDTO paymentDTO = PaymentStateDTO.builder().paymentId(payment.getPaymentId())
+                    .outTradeNo(null).outPayType(null).payerId(null).finishTime(now).state(PaymentState.FAILED)
+                    .description("人工关闭支付订单").version(payment.getVersion()).modifiedTime(now).build();
+                tradeAssistantService.proceedOnlinePayment(paymentDTO);
+
+                TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.CLOSED, trade.getVersion(), now);
+                tradeAssistantService.proceedTradeOrder(tradeStateDTO);
+            }
+        } finally {
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+
+    @Override
+    public OnlinePaymentResult queryPaymentState(String paymentId, String mode) {
+        OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
+        TradeOrder trade = tradeAssistantService.findByTradeId(payment.getTradeId());
+
+        LOG.debug("Query online prepay order[{}-{}] state...", paymentId, payment.getState());
+        // online模式下，如果本地支付申请没有明确的支付结果，将调用支付通道查询预支付订单状态
+        if (!PaymentState.isFinished(payment.getState()) && "online".equalsIgnoreCase(mode)) {
+            OnlinePrepayOrder order = new OnlinePrepayOrder(paymentId, payment.getOutTradeNo());
+            PaymentPipeline<?> paymentPipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
+            if (paymentPipeline instanceof OnlinePipeline<?> pipeline) {
+                // 用于微信服务商模式下，微信子商户信息
+                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
+                OnlinePaymentResponse response = pipeline.queryPrepayResponse(order);
+                return OnlinePaymentResult.of(trade.getTradeId(), paymentId, response.getState(), trade.getOutTradeNo(),
+                    response.getOutPayType(), response.getPayerId(), response.getWhen(), response.getMessage());
+            } else if (paymentPipeline instanceof DiliCardPipeline pipeline) {
+                // 园区卡支付outMchId为市场ID
+                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
+                CardPaymentResponse response = pipeline.queryPaymentResponse(order);
+                return OnlinePaymentResult.of(trade.getTradeId(), paymentId, response.getState(), trade.getOutTradeNo(),
+                    response.getOutPayType(), response.getPayerId(), response.getWhen(), response.getMessage());
+            }
+        }
+        return new OnlinePaymentResult(trade.getTradeId(), paymentId, payment.getState(), trade.getOutTradeNo(),
+            payment.getOutPayType(), payment.getPayerId(), payment.getFinishTime(), payment.getDescription());
+        /*LOG.debug("Query online trade order[{}] state...", tradeId);
+        TradeOrder trade = tradeAssistantService.findByTradeId(tradeId);
+        List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(tradeId, TradeType.TRADE.getCode());
+        if (TradeState.SUCCESS.equalTo(trade.getState()) || TradeState.REFUND.equalTo(trade.getState())) {
+            OnlinePayment payment = onlinePayments.stream().filter(p -> PaymentState.SUCCESS.equalTo(p.getState()))
+                .findFirst().orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "未找到支付订单"));
+            return new OnlinePaymentResult(tradeId, payment.getState(), trade.getOutTradeNo(), payment.getOutPayType(),
+                    payment.getPayerId(), payment.getFinishTime(), payment.getDescription());
+        } else if (TradeState.FAILED.equalTo(trade.getState()) || TradeState.CLOSED.equalTo(trade.getState())) {
+            return OnlinePaymentResult.of(tradeId, PaymentState.FAILED, trade.getOutTradeNo(),
+                    null, null, LocalDateTime.now(), "等待支付");
+        } else { // 交易订单等待支付
+            // 查找交易订单中正在支付中的支付记录
+            OnlinePayment payment = onlinePayments.stream().filter(p -> PaymentState.PROCESSING.equalTo(p.getState()))
+                .findFirst().orElse(null);
+            if (payment == null) { // 交易订单没有支付记录
+                return OnlinePaymentResult.of(tradeId, PaymentState.PENDING, trade.getOutTradeNo(),
+                        null, null, LocalDateTime.now(), "等待支付");
+            }
+            if ("online".equalsIgnoreCase(mode)) {
+                OnlinePrepayOrder order = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
+                OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), OnlinePipeline.class);
+                // 用于微信服务商模式下，微信子商户信息
+                order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
+                OnlinePaymentResponse response = pipeline.queryPrepayResponse(order);
+                return OnlinePaymentResult.of(tradeId, response.getState(), trade.getOutTradeNo(),
+                    response.getOutPayType(), response.getPayerId(), response.getWhen(), response.getMessage());
+            } else {
+                return new OnlinePaymentResult(tradeId, payment.getState(), trade.getOutTradeNo(), payment.getOutPayType(),
+                    payment.getPayerId(), payment.getFinishTime(), payment.getDescription());
+            }
+
+        }*/
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public OnlineRefundResult sendRefundRequest(OnlineRefundDTO request) {
+        TradeOrder trade = tradeAssistantService.findByTradeId(request.getTradeId());
+        if (!TradeState.forRefund(trade.getState())) {
+            throw new TradePaymentException(ErrorCode.INVALID_OBJECT_STATE, "不能进行交易退款: 无效的交易状态");
+        }
+        if (trade.getAmount() < request.getAmount()) {
+            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "申请退费金额超过原支付金额");
+        }
+        // 理论上只会存在一条支付完成的支付订单
+        OnlinePayment payment = onlinePaymentDao.listOnlinePayments(trade.getTradeId(),
+            TradeType.TRADE.getCode(), PaymentState.SUCCESS.getCode()).stream().findFirst()
+            .orElseThrow(() -> new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不能进行交易退款: 无支付信息"));
+
+        LocalDateTime now = LocalDateTime.now().withNano(0);
+        KeyGenerator refundIdKey = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID);
+        String refundId = refundIdKey.nextId();
+        OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), OnlinePipeline.class);
+        OnlineRefundRequest refundRequest = OnlineRefundRequest.of(refundId, payment.getPaymentId(), payment.getOutTradeNo(),
+            trade.getMaxAmount(), request.getAmount(), request.getDescription(), now);
+        refundRequest.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId()); // 用于微信服务商模式下，微信子商户信息
+        OnlineRefundResponse response = pipeline.sendRefundRequest(refundRequest);
+
+        OnlinePayment refund = OnlinePayment.builder().outMchId(payment.getOutMchId()).tradeId(payment.getTradeId())
+            .type(TradeType.REFUND).paymentId(refundId).channelId(payment.getChannelId())
+            .payType(payment.getPayType()).pipelineId(payment.getPipelineId()).goods(payment.getGoods() + "-退款")
+            .amount(request.getAmount()).objectId(payment.getPaymentId()).payerId(payment.getPayerId())
+            .finishTime(response.getWhen()).outTradeNo(response.getOutTradeNo()).outPayType(payment.getOutPayType())
+            .state(response.getState()).description(request.getDescription()).version(0).createdTime(now).modifiedTime(now).build();
+        onlinePaymentDao.insertOnlinePayment(refund);
+
+        if (PaymentState.SUCCESS.equalTo(response.getState())) {
+            Long newAmount = trade.getAmount() - refund.getAmount();
+            TradeStateDTO tradeState = TradeStateDTO.of(trade.getTradeId(), newAmount, TradeState.REFUND, trade.getVersion(), now);
+            tradeAssistantService.proceedTradeOrder(tradeState);
+        } else if (!PaymentState.isFinished(response.getState())) {
+            // 固定周期后，查询退款状态，根据状态完成退款订单
+            TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
+            taskMessageSender.sendDelayTaskMessage(message, trade.getTimeout());
+        }
+
+        return new OnlineRefundResult(refundId, payment.getPaymentId(), response.getState(), response.getWhen(), response.getMessage());
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void notifyRefundResult(OnlineRefundResponse response) {
+        OnlinePayment refund = tradeAssistantService.findByRefundId(response.getRefundId());
+        if (PaymentState.isFinished(refund.getState())) {
+            LOG.warn("Duplicate process online refund order notification for {}:{}", response.getRefundId(), response.getState());
+            return;
+        }
+        if (!PaymentState.isFinished(response.getState())) {
+            LOG.warn("Ignore online refund order notification for {}:{}", response.getRefundId(), response.getState());
+            return;
+        }
+        LOG.info("Processing online refund order notification for {}:{}", response.getRefundId(), response.getState());
+
+        LocalDateTime now = LocalDateTime.now();
+        TradeOrder trade = tradeAssistantService.findByTradeId(refund.getTradeId());
+        PaymentStateDTO refundDTO = PaymentStateDTO.builder().paymentId(refund.getPaymentId())
+            .outTradeNo(response.getOutTradeNo()).finishTime(response.getWhen()).state(response.getState())
+            .description(response.getMessage()).version(refund.getVersion()).modifiedTime(now).build();
+        tradeAssistantService.proceedOnlinePayment(refundDTO);
+
+        if (PaymentState.SUCCESS.equalTo(response.getState())) {
+            Long newAmount = trade.getAmount() - refund.getAmount();
+            TradeStateDTO tradeState = TradeStateDTO.of(trade.getTradeId(), newAmount, TradeState.REFUND, trade.getVersion(), now);
+            tradeAssistantService.proceedTradeOrder(tradeState);
+        }
+
+        OnlineRefundResult refundResult = new OnlineRefundResult(response.getRefundId(), refund.getObjectId(),
+            response.getState(), response.getWhen(), response.getMessage());
+        paymentResultManager.notifyRefundResult(refund.getNotifyUrl(), refundResult);
+    }
+
+    @Override
+    public OnlineRefundResult queryRefundState(String refundId, String mode) {
+        OnlinePayment refund = tradeAssistantService.findByRefundId(refundId);
+
+        LOG.debug("Query online refund order[{}-{}] state...", refundId, refund.getState());
+        // 微信支付通知较为及时和安全，非特殊情况可使用offline模式；一些本地状态与微信状态不一致的"异常订单"可使用online模式同步状态
+        if (!PaymentState.isFinished(refund.getState()) && "online".equalsIgnoreCase(mode)) {
+            WechatPipeline pipeline = paymentPipelineManager.findPipelineById(refund.getPipelineId(), WechatPipeline.class);
+            OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
+            // 用于微信服务商模式下，微信子商户信息
+            order.attach(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, refund.getOutMchId());
+            OnlineRefundResponse response = pipeline.queryRefundResponse(order);
+            return new OnlineRefundResult(refundId, refund.getObjectId(), response.getState(), response.getWhen(), response.getMessage());
+        }
+        return new OnlineRefundResult(refundId, refund.getObjectId(), refund.getState(), refund.getFinishTime(), refund.getDescription());
+    }
 }
@@ -15,7 +15,7 @@ import com.diligrp.cashier.trade.exception.TradePaymentException;
 import com.diligrp.cashier.trade.model.OnlinePayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
 import com.diligrp.cashier.trade.service.ITradeAssistantService;
-import com.diligrp.cashier.trade.type.TradeState;
+import com.diligrp.cashier.trade.type.TradeType;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@ public class TradeAssistantServiceImpl implements ITradeAssistantService {
     @Override
     public TradeOrder findByTradeId(String tradeId) {
         Optional<TradeOrder> tradeOpt = tradeOrderDao.findByTradeId(tradeId);
-        return tradeOpt.orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "支付订单不存在"));
+        return tradeOpt.orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "交易订单不存在"));
     }
     @Override
@@ -58,46 +58,41 @@ public class TradeAssistantServiceImpl implements ITradeAssistantService {
      * 关闭交易订单下状态为支付中的支付订单, 园区卡支付不存在支付中的订单
      *
      * 独立数据库事务, 避免远程支付通道关单后, 支付订单状态仍然为支付中
-     * 任何一笔关闭订单失败都应该返回FALSE，且一笔失败不影响其他能正常的关单操作
      */
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class)
-    public boolean resetTradeOrder(TradeOrder tradeOrder) {
-        // 只有处理中的交易订单存在状态为支付中的支付订单
-        if (!TradeState.isProcessing(tradeOrder.getState())) {
-            return true;
-        }
-
-        boolean result = true;
-        // 理论上只会存在一条支付中的支付订单
-        List<OnlinePayment> onlinePayments = onlinePaymentDao.findByTradeId(tradeOrder.getTradeId(), PaymentState.PROCESSING.getCode());
-        for (OnlinePayment onlinePayment : onlinePayments) {
-            try {
-                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(onlinePayment.getPipelineId(), PaymentPipeline.class);
+    public boolean resetTradeOrder(TradeOrder trade) {
+        // 查询支付订单所有的支付记录, 关闭支付中的支付记录, 忽略支付失败的支付记录, 存在支付成功的支付记录时不允许继续支付
+        List<OnlinePayment> onlinePayments = onlinePaymentDao.listOnlinePayments(trade.getTradeId(), TradeType.TRADE.getCode(), null);
+        for (OnlinePayment payment : onlinePayments) {
+            if (PaymentState.PENDING.equalTo(payment.getState()) || PaymentState.PROCESSING.equalTo(payment.getState())) {
+                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
                 if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
                     LocalDateTime now = LocalDateTime.now();
-                    PaymentStateDTO paymentStateDTO = PaymentStateDTO.builder().paymentId(onlinePayment.getPaymentId())
+                    PaymentStateDTO paymentStateDTO = PaymentStateDTO.builder().paymentId(payment.getPaymentId())
                         .finishTime(now).state(PaymentState.FAILED).description("主动关闭支付中的订单")
-                        .version(onlinePayment.getVersion()).modifiedTime(now).build();
+                        .version(payment.getVersion()).modifiedTime(now).build();
                     proceedOnlinePayment(paymentStateDTO);
-                    OnlinePrepayOrder prepayOrder = new OnlinePrepayOrder(onlinePayment.getPaymentId(), onlinePayment.getOutTradeNo());
+                    OnlinePrepayOrder prepayOrder = new OnlinePrepayOrder(payment.getPaymentId(), payment.getOutTradeNo());
                     // 微信服务商模式下, outMchId为签约子商户; 园区卡支付时, outMchId为市场ID
-                    prepayOrder.attach(Constants.PARAM_MCH_ID, onlinePayment.getOutMchId());
+                    prepayOrder.attach(Constants.PARAM_MCH_ID, payment.getOutMchId());
                     onlinePipeline.closePrepayOrder(prepayOrder);
                 }
-                // 园区卡支付不存在支付中的订单
-            } catch (Exception ex) {
-                result = false;
-                LOG.error("关闭支付订单失败: {}", onlinePayment.getPaymentId(), ex);
+                // 园区卡支付通道不会存在支付中的记录
+            } else if (PaymentState.SUCCESS.equalTo(payment.getState())) {
+                return false;
+            } else if (PaymentState.FAILED.equalTo(payment.getState())) {
+                continue;
             }
         }
-        return result;
+        return true;
     }
     @Override
     public OnlinePayment findByPaymentId(String paymentId) {
-        Optional<OnlinePayment> paymentOpt = onlinePaymentDao.findByPaymentId(paymentId);
-        return paymentOpt.orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "支付订单不存在"));
+        return onlinePaymentDao.findByPaymentId(paymentId)
+            .filter(p -> TradeType.TRADE.equalTo(p.getType()))
+            .orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "支付订单不存在"));
     }
     @Override
@@ -106,4 +101,11 @@ public class TradeAssistantServiceImpl implements ITradeAssistantService {
             throw new TradePaymentException(ErrorCode.SYSTEM_BUSY_ERROR, ErrorCode.MESSAGE_SYSTEM_BUSY);
         }
     }
+
+    @Override
+    public OnlinePayment findByRefundId(String refundId) {
+        return onlinePaymentDao.findByPaymentId(refundId)
+            .filter(p -> TradeType.REFUND.equalTo(p.getType()))
+            .orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "退款订单不存在"));
+    }
 }
 package com.diligrp.cashier.trade.type;
-import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.type.IEnumType;
 import java.util.Arrays;
@@ -15,8 +14,6 @@ public enum TradeState implements IEnumType {
     PENDING("待处理", 1),
-    PROCESSING("处理中", 2),
-
     SUCCESS("交易成功", 4),
     REFUND("交易退款", 5),
@@ -50,14 +47,6 @@ public enum TradeState implements IEnumType {
         return Arrays.asList(TradeState.values());
     }
-    public static boolean isPending(int code) {
-        return TradeState.PENDING.equalTo(code);
-    }
-
-    public static boolean isProcessing(int code) {
-        return TradeState.PROCESSING.equalTo(code);
-    }
-
     public static boolean isFinished(int code) {
         return TradeState.SUCCESS.equalTo(code) || TradeState.FAILED.equalTo(code) ||
             TradeState.REFUND.equalTo(code) || TradeState.CLOSED.equalTo(code);
@@ -20,6 +20,7 @@
         <result column="out_trade_no" property="outTradeNo"/>
         <result column="out_pay_type" property="outPayType"/>
         <result column="state" property="state"/>
+        <result column="notify_url" property="notifyUrl"/>
         <result column="description" property="description"/>
         <result column="version" property="version"/>
         <result column="created_time" property="createdTime"/>
@@ -29,11 +30,11 @@
     <insert id="insertOnlinePayment" parameterType="com.diligrp.cashier.trade.model.OnlinePayment">
         INSERT INTO upay_online_payment(out_mch_id, trade_id, type, payment_id, channel_id, pay_type, pipeline_id,
                                         goods, amount, object_id, payer_id, finish_time, out_trade_no, out_pay_type,
-                                        state, description, version, created_time, modified_time)
+                                        state, notify_url, description, version, created_time, modified_time)
         VALUES
           (#{outMchId}, #{tradeId}, #{type}, #{paymentId}, #{channelId}, #{payType}, #{pipelineId},
            #{goods}, #{amount}, #{objectId}, #{payerId}, #{finishTime}, #{outTradeNo}, #{outPayType}
-           #{state}, #{description}, #{version}, #{createdTime}, #{modifiedTime})
+           #{state}, #{notifyUrl}, #{description}, #{version}, #{createdTime}, #{modifiedTime})
     </insert>
     <select id="findByPaymentId" parameterType="string" resultMap="OnlinePaymentMap">
@@ -67,8 +68,11 @@
         payment_id = #{paymentId} AND version = #{version}
     </update>
-    <select id="findByTradeId" resultMap="OnlinePaymentMap">
+    <select id="listOnlinePayments" resultMap="OnlinePaymentMap">
         SELECT * FROM upay_online_payment WHERE trade_id = #{tradeId}
+        <if test="type != null">
+            AND type = #{type}
+        </if>
         <if test="state != null">
             AND state = #{state}
         </if>
@@ -26,14 +26,14 @@ CREATE TABLE `upay_trade_order` (
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `mch_id` BIGINT NOT NULL COMMENT '商户ID',
     `trade_id` VARCHAR(40) NOT NULL COMMENT '交易ID',
-    `type` TINYINT UNSIGNED NOT NULL COMMENT '业务类型', -- 购买会员
+    `type` TINYINT UNSIGNED NOT NULL COMMENT '订单类型',
     `out_trade_no` VARCHAR(40) COMMENT '外部流水号', -- 商户流水号
     `amount` BIGINT NOT NULL COMMENT '金额-分',
     `max_amount` BIGINT NOT NULL COMMENT '初始金额-分',
     `goods` VARCHAR(128) NOT NULL COMMENT '商品描述',
     `timeout` INTEGER UNSIGNED NOT NULL COMMENT '超时间隔时间-秒',
     `state` TINYINT UNSIGNED NOT NULL COMMENT '交易状态',
-    `notify_url` VARCHAR(128) COMMENT '业务回调链接',
+    `notify_url` VARCHAR(128) COMMENT '业务回调地址',
     `description` VARCHAR(128) COMMENT '交易备注',
     `attach` VARCHAR(255) COMMENT '附加数据',
     `source` TINYINT UNSIGNED  COMMENT '订单来源',
@@ -56,7 +56,7 @@ CREATE TABLE `upay_online_payment` (
     `trade_id` VARCHAR(40) NOT NULL COMMENT '交易ID',
     `type` TINYINT UNSIGNED NOT NULL COMMENT '交易类型',
     `payment_id` VARCHAR(40) NOT NULL COMMENT '支付ID',
-    `channel_id` TINYINT UNSIGNED NOT NULL COMMENT '支付通道',
+    `channel_id` TINYINT UNSIGNED NOT NULL COMMENT '支付渠道',
     `pay_type` TINYINT UNSIGNED NOT NULL COMMENT '支付方式', -- NATIVE MINIPRO
     `pipeline_id` BIGINT NOT NULL COMMENT '通道ID',
     `goods` VARCHAR(128) NOT NULL COMMENT '商品描述',
@@ -67,6 +67,7 @@ CREATE TABLE `upay_online_payment` (
     `out_trade_no` VARCHAR(40) COMMENT '通道流水号',
     `out_pay_type` TINYINT UNSIGNED NOT NULL COMMENT '实际支付方式', -- 银行聚合支付时使用
     `state` TINYINT UNSIGNED NOT NULL COMMENT '申请状态',
+    `notify_url` VARCHAR(128) COMMENT '业务回调地址',
     `description` VARCHAR(256) COMMENT '交易备注',
     `version` INTEGER UNSIGNED NOT NULL COMMENT '数据版本号',
     `created_time` DATETIME COMMENT '创建时间',