bugfix after testing

huanggang
1 parent 173ef84e
Showing 12 changed files with 130 additions and 92 deletions
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-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/core/WechatDirectPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/WechatPartnerPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/OnlineRefundResponse.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/service/impl/WechatPaymentServiceImpl.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/domain/CashierPayment.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/service/impl/CashierPaymentServiceImpl.java
cashier-trade/src/main/resources/com/diligrp/cashier/dao/mapper/IOnlinePaymentDao.xml
@@ -51,7 +51,7 @@ public class CashierDeskController {
     @RequestMapping("/orderPayment")
     public Message<?> orderPayment(@RequestBody CashierPayment request) {
         // 基本参数校验
-        AssertUtils.notEmpty(request.getTradeId(), "paymentId missed");
+        AssertUtils.notEmpty(request.getTradeId(), "tradeId missed");
         AssertUtils.notNull(request.getPipelineId(), "pipelineId missed");
         OnlinePaymentStatus paymentStatus = cashierDeskService.doPayment(request);
@@ -82,7 +82,7 @@ public class WechatPaymentController {
         try {
             OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
-            WechatPipeline pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), WechatPipeline.class);
+            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);
@@ -101,20 +101,20 @@ public class WechatPaymentController {
         }
     }
-    /*@RequestMapping(value = "/refund/{refundId}/notify.do")
+    @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);
+            OnlinePayment refund = tradeAssistantService.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);
+                    cashierPaymentService.notifyRefundResult(refundResponse);
                 }
                 return ResponseEntity.ok(NotifyResult.success());
             } else {
@@ -126,9 +126,9 @@ public class WechatPaymentController {
             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 {
+    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());
@@ -138,7 +138,7 @@ public class WechatPaymentController {
             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());
+                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);
@@ -149,7 +149,7 @@ public class WechatPaymentController {
         }
     }
-    private OnlineRefundResponse refundResponse(WechatPipeline pipeline, WechatNotifyResponse notifyResponse) throws Exception {
+    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());
@@ -157,10 +157,10 @@ public class WechatPaymentController {
         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());
+            refundState, response.getRefund_status());
     }
-    private boolean dataVerify(HttpServletRequest request, WechatPipeline pipeline, String payload) {
+    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);
@@ -193,7 +193,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             LocalDateTime when = DateUtils.parseDateTime((String) response.get("success_time"), WechatConstants.RFC3339_FORMAT);
             PaymentState state = WechatStateUtils.getRefundState((String) response.get("status"));
             return OnlineRefundResponse.of((String) response.get("out_refund_no"), (String) response.get("refund_id"),
-                when, state.getCode(), (String) response.get("status"));
+                when, state, (String) response.get("status"));
         } else {
             LOG.info("send wechat refund failed: {}", result.statusCode);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
@@ -224,7 +224,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             LocalDateTime when = DateUtils.parseDateTime((String) response.get("success_time"), WechatConstants.RFC3339_FORMAT);
             PaymentState state = WechatStateUtils.getRefundState((String) response.get("status"));
             return OnlineRefundResponse.of((String) response.get("out_refund_no"), (String) response.get("refund_id"),
-                when, state.getCode(), (String) response.get("user_received_account"));
+                when, state, (String) response.get("user_received_account"));
         } else if (result.statusCode == 404) {
             throw new PaymentPipelineException(ErrorCode.OBJECT_NOT_FOUND, "发起微信退款查询失败: 退款单不存在");
         } else {
@@ -201,7 +201,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             LocalDateTime when = DateUtils.parseDateTime((String) response.get("success_time"), WechatConstants.RFC3339_FORMAT);
             PaymentState state = WechatStateUtils.getRefundState((String) response.get("status"));
             return OnlineRefundResponse.of((String) response.get("out_refund_no"), (String) response.get("refund_id"),
-                when, state.getCode(), (String) response.get("status"));
+                when, state, (String) response.get("status"));
         } else {
             LOG.info("send wechat payment refund failed: {}", result.statusCode);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
@@ -235,7 +235,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             LocalDateTime when = DateUtils.parseDateTime((String) response.get("success_time"), WechatConstants.RFC3339_FORMAT);
             PaymentState state = WechatStateUtils.getRefundState((String) response.get("status"));
             return OnlineRefundResponse.of((String) response.get("out_refund_no"), (String) response.get("refund_id"),
-                when, state.getCode(), (String) response.get("user_received_account"));
+                when, state, (String) response.get("user_received_account"));
         } else if (result.statusCode == 404) {
             throw new PaymentPipelineException(ErrorCode.OBJECT_NOT_FOUND, "发起微信退款查询失败: 退款单不存在");
         } else {
@@ -286,8 +286,9 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         amount.put("currency", "CNY");
         params.put("amount", amount);
         Map<String, Object> payer = new LinkedHashMap<>();
-        // 传入微信用户在服务商APPID下的openid，如果是子商户APPID下的openid，则应该使用sub_appid
-        payer.put("sp_openid", request.getOpenId());
+        // 如果是服务商APPID下的openid则使用sp_openid; 如果是子商户APPID下的openid, 则使用sub_openid
+//        payer.put("sp_openid", request.getOpenId());
+        payer.put("sub_openid", request.getOpenId());
         params.put("payer", payer);
         return JsonUtils.toJsonString(params);
     }
 package com.diligrp.cashier.pipeline.core;
+import com.diligrp.cashier.pipeline.Constants;
 import com.diligrp.cashier.pipeline.client.CardPaymentHttpClient;
 import com.diligrp.cashier.pipeline.domain.OnlinePrepayOrder;
 import com.diligrp.cashier.pipeline.domain.OnlineRefundRequest;
@@ -34,6 +35,8 @@ public class DiliCardPipeline extends PaymentPipeline&lt;DiliCardPipeline.CardParam
      */
     public CardPaymentResponse sendPaymentRequest(CardPaymentRequest request) {
         try {
+            // 外部商户号设置为市场ID
+            request.put(Constants.PARAM_MCH_ID, params().outMchId);
             return client.sendPaymentRequest(request);
         } catch (PaymentPipelineException | IllegalArgumentException pse) {
             throw pse;
@@ -46,9 +49,11 @@ public class DiliCardPipeline extends PaymentPipeline&lt;DiliCardPipeline.CardParam
     /**
      * 查询支付订单状态
      */
-    public CardPaymentResponse queryPaymentResponse(OnlinePrepayOrder order) {
+    public CardPaymentResponse queryPaymentResponse(OnlinePrepayOrder request) {
         try {
-            return client.queryPaymentResponse(order);
+            // 外部商户号设置为市场ID
+            request.put(Constants.PARAM_MCH_ID, params().outMchId);
+            return client.queryPaymentResponse(request);
         } catch (PaymentPipelineException | IllegalArgumentException pse) {
             throw pse;
         } catch (Exception ex) {
@@ -58,17 +63,12 @@ public class DiliCardPipeline extends PaymentPipeline&lt;DiliCardPipeline.CardParam
     }
     /**
-     * 关闭预支付订单
-     */
-    public void closePrepayOrder(OnlinePrepayOrder request) {
-        // 不调用远程关单接口
-    }
-
-    /**
      * 退款申请
      */
     public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
         try {
+            // 外部商户号设置为市场ID
+            request.put(Constants.PARAM_MCH_ID, params().outMchId);
             return client.sendRefundRequest(request);
         } catch (PaymentPipelineException | IllegalArgumentException pse) {
             throw pse;
 package com.diligrp.cashier.pipeline.core;
+import com.diligrp.cashier.pipeline.Constants;
 import com.diligrp.cashier.pipeline.client.WechatDirectHttpClient;
 import com.diligrp.cashier.pipeline.client.WechatHttpClient;
+import com.diligrp.cashier.pipeline.domain.*;
 import com.diligrp.cashier.shared.util.AssertUtils;
 /**
@@ -33,6 +35,55 @@ public class WechatDirectPipeline extends WechatPipeline&lt;WechatDirectPipeline.Di
     }
     @Override
+    public NativePrepayResponse sendNativePrepayRequest(NativePrepayRequest request) {
+        // 直连模式下，外部商户号设置为微信商户号
+        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+        return super.sendNativePrepayRequest(request);
+    }
+
+    @Override
+    public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
+        // 直连模式下，外部商户号设置为微信商户号
+        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+        return super.sendMiniProPrepayRequest(request);
+    }
+
+    @Override
+    public OnlinePaymentResponse sendQrCodePaymentRequest(QrCodePaymentRequest request) {
+        // 直连模式下，外部商户号设置为微信商户号
+        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+        return super.sendQrCodePaymentRequest(request);
+    }
+
+    @Override
+    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder request) {
+        // 直连模式下，外部商户号设置为微信商户号
+        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+        return super.queryPrepayResponse(request);
+    }
+
+    @Override
+    public void closePrepayOrder(OnlinePrepayOrder request) {
+        // 直连模式下，外部商户号设置为微信商户号
+        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+        super.closePrepayOrder(request);
+    }
+
+    @Override
+    public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
+        // 直连模式下，外部商户号设置为微信商户号
+        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+        return super.sendRefundRequest(request);
+    }
+
+    @Override
+    public OnlineRefundResponse queryRefundResponse(OnlineRefundOrder request) {
+        // 直连模式下，外部商户号设置为微信商户号
+        request.put(Constants.PARAM_MCH_ID, wechatConfig.getMchId());
+        return super.queryRefundResponse(request);
+    }
+
+    @Override
     public Class<DirectWechatParams> paramClass() {
         return DirectWechatParams.class;
     }
@@ -42,64 +42,50 @@ public class WechatPartnerPipeline extends WechatPipeline&lt;WechatPartnerPipeline.
     @Override
     public NativePrepayResponse sendNativePrepayRequest(NativePrepayRequest request) {
-        // 业务没有传递子商户则使用默认配置
-        if (request.getString(Constants.PARAM_MCH_ID) == null) {
-            request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        }
+        // 服务商模式下，外部商户号默认设置为特约子商户
+        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
         return super.sendNativePrepayRequest(request);
     }
     @Override
     public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
-        // 业务没有传递子商户则使用默认配置
-        if (request.getString(Constants.PARAM_MCH_ID) == null) {
-            request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        }
+        // 服务商模式下，外部商户号默认设置为特约子商户
+        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
         return super.sendMiniProPrepayRequest(request);
     }
     @Override
     public OnlinePaymentResponse sendQrCodePaymentRequest(QrCodePaymentRequest request) {
-        // 业务没有传递子商户则使用默认配置
-        if (request.getString(Constants.PARAM_MCH_ID) == null) {
-            request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        }
+        // 服务商模式下，外部商户号默认设置为特约子商户
+        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
         return super.sendQrCodePaymentRequest(request);
     }
     @Override
-    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder order) {
-        // 业务没有传递子商户则使用默认配置
-        if (order.getString(Constants.PARAM_MCH_ID) == null) {
-            order.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        }
-        return super.queryPrepayResponse(order);
+    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder request) {
+        // 服务商模式下，外部商户号默认设置为特约子商户
+        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
+        return super.queryPrepayResponse(request);
     }
     @Override
     public void closePrepayOrder(OnlinePrepayOrder request) {
-        // 业务没有传递子商户则使用默认配置
-        if (request.getString(Constants.PARAM_MCH_ID) == null) {
-            request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        }
+        // 服务商模式下，外部商户号默认设置为特约子商户
+        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
         super.closePrepayOrder(request);
     }
     @Override
     public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
-        // 业务没有传递子商户则使用默认配置
-        if (request.getString(Constants.PARAM_MCH_ID) == null) {
-            request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        }
+        // 服务商模式下，外部商户号默认设置为特约子商户
+        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
         return super.sendRefundRequest(request);
     }
     @Override
     public OnlineRefundResponse queryRefundResponse(OnlineRefundOrder request) {
-        // 业务没有传递子商户则使用默认配置
-        if (request.getString(Constants.PARAM_MCH_ID) == null) {
-            request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
-        }
+        // 服务商模式下，外部商户号默认设置为特约子商户
+        request.put(Constants.PARAM_MCH_ID, params().getSubMchId());
         return super.queryRefundResponse(request);
     }
 package com.diligrp.cashier.pipeline.domain;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+
 import java.time.LocalDateTime;
 /**
@@ -7,25 +9,27 @@ import java.time.LocalDateTime;
  */
 public class OnlineRefundResponse {
     // 商户退款单号
-    private String refundId;
+    private final String refundId;
     // 通道退款订单号
-    private String outTradeNo;
+    private final String outTradeNo;
     // 退款完成时间
-    private LocalDateTime when;
+    private final LocalDateTime when;
     // 退款状态
-    private Integer state;
+    private final Integer state;
     // 交易备注
-    private String message;
+    private final String message;
     public static OnlineRefundResponse of(String refundId, String outTradeNo, LocalDateTime when,
-                                          Integer state, String message) {
-        OnlineRefundResponse response = new OnlineRefundResponse();
-        response.refundId = refundId;
-        response.outTradeNo = outTradeNo;
-        response.when = when;
-        response.state = state;
-        response.message = message;
-        return response;
+                                          PaymentState state, String message) {
+        return new OnlineRefundResponse(refundId, outTradeNo, when, state.getCode(), message);
+    }
+
+    public OnlineRefundResponse(String refundId, String outTradeNo, LocalDateTime when, Integer state, String message) {
+        this.refundId = refundId;
+        this.outTradeNo = outTradeNo;
+        this.when = when;
+        this.state = state;
+        this.message = message;
     }
     public String getRefundId() {
@@ -5,7 +5,6 @@ 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.domain.wechat.WechatConfig;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
 import com.diligrp.cashier.pipeline.service.IWechatPaymentService;
 import jakarta.annotation.Resource;
@@ -24,11 +23,11 @@ public class WechatPaymentServiceImpl implements IWechatPaymentService {
     public String openIdByCode(Long pipelineId, String code) {
         WechatPipeline<?> pipeline = paymentPipelineManager.findPipelineById(pipelineId, WechatPipeline.class);
         if (pipeline instanceof WechatPartnerPipeline partnerPipeline) {
-            // 服务商模式下subMchId和subAppId配置upay_payment_pipeline.params，对应的appSecret配置在upay_wechat_param.app_secret
+            // 服务商模式下使用WechatParams配置的信息获取openId
             WechatPartnerPipeline.PartnerWechatParams params = partnerPipeline.params();
-            WechatConfig config = pipeline.getClient().getWechatConfig();
-            return pipeline.getClient().loginAuthorization(params.getSubAppId(), config.getAppSecret(), code);
+            return pipeline.getClient().loginAuthorization(params.getSubAppId(), params.getAppSecret(), code);
         } else {
+            // 直连模式直接使用WebConfig配置的信息获取openId
             return pipeline.getClient().loginAuthorization(code);
         }
     }
@@ -7,8 +7,6 @@ public class CashierPayment {
     private String tradeId;
     // 选择的支付通道
     private Long pipelineId;
-    // 用户标识
-    private Long userId;
     // 支付参数
     private Map<String, Object> params;
@@ -28,14 +26,6 @@ public class CashierPayment {
         this.pipelineId = pipelineId;
     }
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
     public Map<String, Object> getParams() {
         return params;
     }
@@ -148,8 +148,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                         .state(response.getState()).version(0).createdTime(now).modifiedTime(now).build();
                     onlinePaymentDao.insertOnlinePayment(payment);
                     return response;
-                }
-                if (pipeline instanceof DiliCardPipeline cardPipeline) { // 园区卡支付通道
+                } else if (pipeline instanceof DiliCardPipeline cardPipeline) { // 园区卡支付通道
                     // 园区卡支付通道: 所有的收银台类型使用的是同一种园区卡支付流程
                     CardPaymentRequest request = new CardPaymentConverter(trade, paymentId, now).convert(cashierPayment);
                     // 修改支付状态为支付中，防止重复支付
@@ -157,13 +156,13 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                     // 支付成功插入支付记录并修改交易订单状态，失败可以继续支付
                     if (response.getState() == PaymentState.SUCCESS) {
                         // 园区卡支付通道outMchId为市场ID
-                        String outMchId = cardPipeline.params().getOutMchId();
+                        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(cardPipeline.supportedChannel())
                             .payType(PaymentType.DIRECT).pipelineId(cardPipeline.pipelineId()).goods(trade.getGoods())
                             .amount(trade.getAmount()).payerId(response.getPayerId())
                             .finishTime(response.getWhen()).outTradeNo(response.getOutTradeNo())
-                            .outPayType(OutPaymentType.DILICARD).state(response.getState()).notifyUrl(trade.getNotifyUrl())
+                            .outPayType(response.getOutPayType()).state(response.getState()).notifyUrl(trade.getNotifyUrl())
                             .description(response.getMessage()).version(0).createdTime(now).modifiedTime(now).build();
                         onlinePaymentDao.insertOnlinePayment(payment);
@@ -355,11 +354,19 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         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);
+        PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.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);
+        // 微信支付外部商户号为微信商户号或特约子商户; 园区卡支付外部商户号为市场ID
+        refundRequest.put(com.diligrp.cashier.pipeline.Constants.PARAM_MCH_ID, payment.getOutMchId());
+        OnlineRefundResponse response;
+        if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+            response = onlinePipeline.sendRefundRequest(refundRequest);
+        } else if (pipeline instanceof DiliCardPipeline cardPipeline) {
+            response = cardPipeline.sendRefundRequest(refundRequest);
+        } else {
+            throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不支持的支付通道");
+        }
         OnlinePayment refund = OnlinePayment.builder().outMchId(payment.getOutMchId()).tradeId(payment.getTradeId())
             .type(TradeType.REFUND).paymentId(refundId).channelId(payment.getChannelId())
@@ -33,7 +33,7 @@
                                         state, notify_url, description, version, created_time, modified_time)
         VALUES
           (#{outMchId}, #{tradeId}, #{type}, #{paymentId}, #{channelId}, #{payType}, #{pipelineId},
-           #{goods}, #{amount}, #{objectId}, #{payerId}, #{finishTime}, #{outTradeNo}, #{outPayType}
+           #{goods}, #{amount}, #{objectId}, #{payerId}, #{finishTime}, #{outTradeNo}, #{outPayType},
            #{state}, #{notifyUrl}, #{description}, #{version}, #{createdTime}, #{modifiedTime})
     </insert>