trade refund supported

huanggang
1 parent 5103e910
Showing 28 changed files with 303 additions and 125 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/CardPaymentController.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/CashierOrderDTO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/CashierOrderConverter.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/CashierOrderConverter2.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.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/DefaultTimeStrategy.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/DiliCardPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/OnlineRefundResponse.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/card/CardPaymentRequest.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/domain/card/UserCardDTO.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/type/CashierType.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/type/OutPaymentType.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/exception/PlatformServiceException.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/spi/domain/CashierOrderBO.java
cashier-trade/src/main/java/com/diligrp/cashier/trade/type/SourceType.java → cashier-shared/src/main/java/com/diligrp/cashier/shared/type/SourceType.java
+package com.diligrp.cashier.boss.controller;
+
+import com.diligrp.cashier.pipeline.core.DiliCardPipeline;
+import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
+import com.diligrp.cashier.shared.domain.Message;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(value = "/card")
+public class CardPaymentController {
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    @RequestMapping(value = "/payment/listUserCards")
+    public Message<?> listUserCards(@RequestParam("pipelineId") Long pipelineId, @RequestParam("userId") String userId) {
+        DiliCardPipeline cardPipeline = paymentPipelineManager.findPipelineById(pipelineId, DiliCardPipeline.class);
+        return Message.success(cardPipeline.getClient().listUserCards(userId));
+    }
+}
@@ -72,7 +72,7 @@ public class CashierDeskController {
         return Message.success(response);
     }
-    @RequestMapping(value = "/orderRefund.do")
+    @RequestMapping(value = "/orderRefund")
     public Message<?> requestRefund(@RequestBody OnlineRefundDTO request) {
         AssertUtils.notEmpty(request.getTradeId(), "tradeId missed");
         AssertUtils.notNull(request.getAmount(), "amount missed");
@@ -156,7 +156,7 @@ public class WechatPaymentController {
         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,
+        return new OnlineRefundResponse(response.getOut_refund_no(), response.getRefund_id(), when,
             refundState, response.getRefund_status());
     }
@@ -23,6 +23,8 @@ public class CashierOrderDTO {
     private String description;
     // 附加数据
     private String attach;
+    // 订单来源
+    private Integer source;
     public Long getMchId() {
         return mchId;
@@ -111,4 +113,12 @@ public class CashierOrderDTO {
     public void setAttach(String attach) {
         this.attach = attach;
     }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
 }
@@ -10,6 +10,7 @@ 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.pipeline.service.IPaymentPipelineManager;
+import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.util.ObjectUtils;
 import com.diligrp.cashier.trade.domain.*;
@@ -97,10 +98,11 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
     @Override
     public OnlinePaymentStatus doPayment(CashierPayment payment) {
         OnlinePaymentStatus paymentStatus =  cashierPaymentService.doPayment(payment);
-        // 只要提交了收银台支付，无论是否支付成功，都使token失效，收银台页面将无法重新打开
-        String token = CashierOrderToken.encode(Long.valueOf(payment.getTradeId()), cashierDeskProperties.getSecretKey());
-        String tokenKey = String.format(Constants.TRADE_REDIS_KEY, token);
-        stringRedisTemplate.delete(tokenKey);
+        // 收银台支付成功，都使token失效，收银台页面将无法重新打开
+        if (paymentStatus.getState() == PaymentState.SUCCESS) {
+            String tokenKey = String.format(Constants.TRADE_REDIS_KEY, payment.getTradeId());
+            stringRedisTemplate.delete(tokenKey);
+        }
         return paymentStatus;
     }
@@ -3,6 +3,7 @@ package com.diligrp.cashier.boss.util;
 import com.diligrp.cashier.boss.domain.CashierOrderDTO;
 import com.diligrp.cashier.pipeline.type.CashierType;
 import com.diligrp.cashier.shared.codec.IConverter;
+import com.diligrp.cashier.shared.type.SourceType;
 import com.diligrp.cashier.trade.domain.CashierOrder;
 public class CashierOrderConverter implements IConverter<CashierOrderDTO, CashierOrder> {
@@ -22,6 +23,7 @@ public class CashierOrderConverter implements IConverter&lt;CashierOrderDTO, Cashie
         cashierOrder.setRedirectUrl(cashierOrderDTO.getRedirectUrl());
         cashierOrder.setDescription(cashierOrderDTO.getDescription());
         cashierOrder.setAttach(cashierOrderDTO.getAttach());
+        cashierOrder.setSource(SourceType.getIfNonNull(cashierOrderDTO.getSource()));
         return cashierOrder;
     }
 }
@@ -3,6 +3,7 @@ package com.diligrp.cashier.boss.util;
 import com.diligrp.cashier.pipeline.type.CashierType;
 import com.diligrp.cashier.shared.codec.IConverter;
 import com.diligrp.cashier.shared.spi.domain.CashierOrderBO;
+import com.diligrp.cashier.shared.type.SourceType;
 import com.diligrp.cashier.trade.domain.CashierOrder;
 public class CashierOrderConverter2 implements IConverter<CashierOrderBO, CashierOrder> {
@@ -10,18 +11,19 @@ public class CashierOrderConverter2 implements IConverter&lt;CashierOrderBO, Cashie
     public static IConverter<CashierOrderBO, CashierOrder> INSTANCE = new CashierOrderConverter2();
     @Override
-    public CashierOrder convert(CashierOrderBO cashierOrderDTO) {
+    public CashierOrder convert(CashierOrderBO cashierOrderBO) {
         CashierOrder cashierOrder = new CashierOrder();
-        cashierOrder.setUserId(cashierOrderDTO.getUserId());
-        cashierOrder.setType(CashierType.getByCode(cashierOrderDTO.getCashierType()));
-        cashierOrder.setGoods(cashierOrderDTO.getGoods());
-        cashierOrder.setAmount(cashierOrderDTO.getAmount());
-        cashierOrder.setTimeout(cashierOrderDTO.getTimeout());
-        cashierOrder.setOutTradeNo(cashierOrderDTO.getOutTradeNo());
-        cashierOrder.setNotifyUrl(cashierOrderDTO.getNotifyUrl());
-        cashierOrder.setRedirectUrl(cashierOrderDTO.getRedirectUrl());
-        cashierOrder.setDescription(cashierOrderDTO.getDescription());
-        cashierOrder.setAttach(cashierOrderDTO.getAttach());
+        cashierOrder.setUserId(cashierOrderBO.getUserId());
+        cashierOrder.setType(CashierType.getByCode(cashierOrderBO.getCashierType()));
+        cashierOrder.setGoods(cashierOrderBO.getGoods());
+        cashierOrder.setAmount(cashierOrderBO.getAmount());
+        cashierOrder.setTimeout(cashierOrderBO.getTimeout());
+        cashierOrder.setOutTradeNo(cashierOrderBO.getOutTradeNo());
+        cashierOrder.setNotifyUrl(cashierOrderBO.getNotifyUrl());
+        cashierOrder.setRedirectUrl(cashierOrderBO.getRedirectUrl());
+        cashierOrder.setDescription(cashierOrderBO.getDescription());
+        cashierOrder.setAttach(cashierOrderBO.getAttach());
+        cashierOrder.setSource(SourceType.getIfNonNull(cashierOrderBO.getSource()));
         return cashierOrder;
     }
 }
 package com.diligrp.cashier.pipeline.client;
-import com.diligrp.cashier.pipeline.domain.*;
+import com.diligrp.cashier.pipeline.domain.OnlineRefundRequest;
+import com.diligrp.cashier.pipeline.domain.OnlineRefundResponse;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentRequest;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentResponse;
+import com.diligrp.cashier.pipeline.domain.card.UserCardDTO;
+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.shared.ErrorCode;
 import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
+import com.diligrp.cashier.shared.type.SourceType;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 public class CardPaymentHttpClient extends ServiceEndpointSupport {
     private static final Logger LOG = LoggerFactory.getLogger(CardPaymentHttpClient.class);
-    private static final String QUERY_PAYMENT_URI = "/api/cardPayment/queryResult";
+    private static final String PAYMENT_URL = "/api/cashier/pay";
+
+    private static final String REFUND_URL = "/api/cashier/refund";
-    private static final String LIST_CARD_URI = "/api/query/list";
+    private static final String LIST_CARD_URL = "/cashier/query/accountList";
     private final String baseUri;
-    public CardPaymentHttpClient(String baseUri) {
+    private final Long outMchId;
+
+    private final Long accountId;
+
+    public CardPaymentHttpClient(String baseUri, Long outMchId, Long accountId) {
         this.baseUri = baseUri;
+        this.outMchId = outMchId;
+        this.accountId = accountId;
     }
     public CardPaymentResponse sendPaymentRequest(CardPaymentRequest request) {
-        return null;
-    }
+        String uri = String.format("%s%s", baseUri, PAYMENT_URL);
+        SourceType sourceType = request.getObject("source", SourceType.class);
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("mchId", outMchId); // 市场ID
+        params.put("accountId", accountId); // 市场ID
+        params.put("fromCardNo", request.getCardNo());
+        params.put("fromAccountId", request.getAccountId());
+        params.put("amount", request.getAmount());
+        params.put("serviceCost", 0);
+        params.put("password", request.getPassword());
+        params.put("outTradeNo", request.getPaymentId());
+        params.put("goodsDesc", request.getGoods());
+        params.put("description", request.getDescription());
+        if (sourceType != null) {
+            params.put("sourceId", sourceType.getCode());
+            params.put("sourceName", sourceType.getName());
+        }
+        String payload = JsonUtils.toJsonString(params);
-    public CardPaymentResponse queryPaymentResponse(OnlinePrepayOrder order) {
-        return null;
+        LOG.debug("Sending card payment request: {}", payload);
+        LocalDateTime now = LocalDateTime.now();
+        HttpResult result = send(uri, payload);
+        if (result.statusCode == 200) {
+            LOG.debug("Received from card payment pipeline: {}", result.responseText);
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+            if ("200".equals(response.get("code"))) {
+                String outTradeNo = (String) response.get("data");
+                return new CardPaymentResponse(request.getPaymentId(), outTradeNo,
+                    OutPaymentType.DILICARD, String.valueOf(request.getAccountId()), now,
+                    PaymentState.SUCCESS, "园区卡支付成功");
+            } else {
+                throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "园区卡支付失败: " + response.get("message"));
+            }
+        }
+        throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "园区卡支付失败: 支付通道调用失败");
     }
     public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
-        return null;
+        String uri = String.format("%s%s", baseUri, REFUND_URL);
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("refundId", request.getRefundId());
+        params.put("outTradeNo", request.getPaymentId());
+        params.put("amount", request.getAmount());
+        String payload = JsonUtils.toJsonString(params);
+
+        LOG.debug("Sending card refund request: {}", payload);
+        LocalDateTime now = LocalDateTime.now();
+        HttpResult result = send(uri, payload);
+        if (result.statusCode == 200) {
+            LOG.debug("Received from card payment pipeline: {}", result.responseText);
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+            if ("200".equals(response.get("code"))) {
+                return new OnlineRefundResponse(request.getRefundId(), null, now,
+                    PaymentState.SUCCESS, "园区卡退款成功");
+            } else {
+                throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "园区卡支付退款失败: " + response.get("message"));
+            }
+        }
+        throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "园区卡支付退款失败: 支付通道调用失败");
     }
-    private PaymentState paymentState(int stateCode) {
-        return switch (stateCode) {
-            case 4 -> PaymentState.SUCCESS;
-            case 5 -> PaymentState.FAILED;
-            default -> PaymentState.PENDING;
-        };
+    public List<UserCardDTO> listUserCards(String userId) {
+        String uri = String.format("%s%s", baseUri, LIST_CARD_URL);
+        Map<String, Object> params = new LinkedHashMap<>();
+        params.put("mchId", outMchId);
+        params.put("customerId", Long.parseLong(userId));
+        String payload = JsonUtils.toJsonString(params);
+
+        LOG.debug("Sending list user card request: {}", payload);
+        HttpResult result = send(uri, payload);
+        if (result.statusCode == 200) {
+            LOG.debug("Received from card payment pipeline: {}", result.responseText);
+            Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+            if ("200".equals(response.get("code"))) {
+                List<UserCardDTO> userCards = new ArrayList<>();
+                Object data = response.get("data");
+                if (data != null) {
+                    List<Map<String, Object>> cardList = JsonUtils.convertValue(data, new TypeReference<>() {});
+                    for (Map<String, Object> card : cardList) {
+                        UserCardDTO userCard = new UserCardDTO(convertLong(card.get("customerId")),
+                            convertLong(card.get("accountId")), (String) card.get("cardNo"),
+                            (String) card.get("customerName"), convertLong(card.get("amount")));
+                        userCards.add(userCard);
+                    }
+                }
+
+                return userCards;
+            } else {
+                throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "查询园区卡失败: " + response.get("message"));
+            }
+        }
+        throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "查询园区卡失败: 支付通道调用失败");
     }
     private Long convertLong(Object value) {
@@ -192,7 +192,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             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"),
+            return new OnlineRefundResponse((String) response.get("out_refund_no"), (String) response.get("refund_id"),
                 when, state, (String) response.get("status"));
         } else {
             LOG.info("send wechat refund failed: {}", result.statusCode);
@@ -223,7 +223,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             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"),
+            return new OnlineRefundResponse((String) response.get("out_refund_no"), (String) response.get("refund_id"),
                 when, state, (String) response.get("user_received_account"));
         } else if (result.statusCode == 404) {
             throw new PaymentPipelineException(ErrorCode.OBJECT_NOT_FOUND, "发起微信退款查询失败: 退款单不存在");
@@ -200,7 +200,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             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"),
+            return new OnlineRefundResponse((String) response.get("out_refund_no"), (String) response.get("refund_id"),
                 when, state, (String) response.get("status"));
         } else {
             LOG.info("send wechat payment refund failed: {}", result.statusCode);
@@ -234,7 +234,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             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"),
+            return new OnlineRefundResponse((String) response.get("out_refund_no"), (String) response.get("refund_id"),
                 when, state, (String) response.get("user_received_account"));
         } else if (result.statusCode == 404) {
             throw new PaymentPipelineException(ErrorCode.OBJECT_NOT_FOUND, "发起微信退款查询失败: 退款单不存在");
@@ -4,13 +4,13 @@ import static com.diligrp.cashier.pipeline.Constants.*;
 public class DefaultTimeStrategy implements ScanTimeStrategy {
     // 预支付订单扫描时间策略
-    private long[] prepayTimeArray = { 10 * ONE_MINUTE };
+    private final long[] prepayTimeArray = { 10 * ONE_MINUTE };
     // 直接支付订单扫描时间策略
-    private long[] paymentTimeArray = {5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 10 * ONE_SECOND, 15 * ONE_SECOND};
+    private final long[] paymentTimeArray = {5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 5 * ONE_SECOND, 10 * ONE_SECOND, 15 * ONE_SECOND};
     // 退款订单扫描时间策略
-    private long[] refundTimeArray = { 10 * ONE_MINUTE };
+    private final long[] refundTimeArray = { 10 * ONE_MINUTE };
     @Override
     public long nextPrepayScanTime(int times) {
@@ -2,7 +2,6 @@ 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;
 import com.diligrp.cashier.pipeline.domain.OnlineRefundResponse;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentRequest;
@@ -10,6 +9,7 @@ import com.diligrp.cashier.pipeline.domain.card.CardPaymentResponse;
 import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
 import com.diligrp.cashier.pipeline.type.ChannelType;
 import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.util.AssertUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,8 +26,12 @@ public class DiliCardPipeline extends PaymentPipeline&lt;DiliCardPipeline.CardParam
     public DiliCardPipeline(long mchId, long pipelineId, String name, String uri, String params) throws Exception {
         super(mchId, pipelineId, name, uri, params);
+        CardParams config = params();
+        AssertUtils.notNull(config.getOutMchId(), "园区卡支付缺少参数配置: outMchId");
+        AssertUtils.notNull(config.getAccountId(), "园区卡支付缺少参数配置: accountId");
+
         this.strategy = new DefaultTimeStrategy();
-        this.client = new CardPaymentHttpClient(uri);
+        this.client = new CardPaymentHttpClient(uri, config.getOutMchId(), config.getAccountId());
     }
     /**
@@ -47,22 +51,6 @@ public class DiliCardPipeline extends PaymentPipeline&lt;DiliCardPipeline.CardParam
     }
     /**
-     * 查询支付订单状态
-     */
-    public CardPaymentResponse queryPaymentResponse(OnlinePrepayOrder request) {
-        try {
-            // 外部商户号设置为市场ID
-            request.put(Constants.PARAM_MCH_ID, params().outMchId);
-            return client.queryPaymentResponse(request);
-        } catch (PaymentPipelineException | IllegalArgumentException pse) {
-            throw pse;
-        } catch (Exception ex) {
-            LOG.error("Query card payment state request exception", ex);
-            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "查询地利支付状态失败");
-        }
-    }
-
-    /**
      * 退款申请
      */
     public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
@@ -92,20 +80,34 @@ public class DiliCardPipeline extends PaymentPipeline&lt;DiliCardPipeline.CardParam
         return CardParams.class;
     }
+    public CardPaymentHttpClient getClient() {
+        return client;
+    }
+
     public static class CardParams extends PipelineParams {
         // 园区卡所属市场
-        private String outMchId;
+        private Long outMchId;
+        // 收款卡号
+        private Long accountId;
         public CardParams(String params) {
             super(params);
         }
-        public String getOutMchId() {
+        public Long getOutMchId() {
             return outMchId;
         }
-        public void setOutMchId(String outMchId) {
+        public void setOutMchId(Long outMchId) {
             this.outMchId = outMchId;
         }
+
+        public Long getAccountId() {
+            return accountId;
+        }
+
+        public void setAccountId(Long accountId) {
+            this.accountId = accountId;
+        }
     }
 }
@@ -15,16 +15,11 @@ public class OnlineRefundResponse {
     // 退款完成时间
     private final LocalDateTime when;
     // 退款状态
-    private final Integer state;
+    private final PaymentState state;
     // 交易备注
     private final String message;
-    public static OnlineRefundResponse of(String refundId, String outTradeNo, LocalDateTime when,
-                                          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) {
+    public OnlineRefundResponse(String refundId, String outTradeNo, LocalDateTime when, PaymentState state, String message) {
         this.refundId = refundId;
         this.outTradeNo = outTradeNo;
         this.when = when;
@@ -44,7 +39,7 @@ public class OnlineRefundResponse {
         return when;
     }
-    public Integer getState() {
+    public PaymentState getState() {
         return state;
     }
@@ -5,14 +5,19 @@ import com.diligrp.cashier.pipeline.domain.OnlinePaymentRequest;
 import java.time.LocalDateTime;
 public class CardPaymentRequest extends OnlinePaymentRequest {
+    // 付款账号
     private final Long accountId;
+    // 付款卡号
     private final String cardNo;
+    // 密码
+    private final String password;
     public CardPaymentRequest(String paymentId, long amount, String goods, String description, LocalDateTime when,
-                              Long accountId, String cardNo) {
+                              Long accountId, String cardNo, String password) {
         super(paymentId, amount, goods, description, when);
         this.accountId = accountId;
         this.cardNo = cardNo;
+        this.password = password;
     }
     public Long getAccountId() {
@@ -22,4 +27,8 @@ public class CardPaymentRequest extends OnlinePaymentRequest {
     public String getCardNo() {
         return cardNo;
     }
+
+    public String getPassword() {
+        return password;
+    }
 }
@@ -12,20 +12,18 @@ public class UserCardDTO {
     private String cardNo;
     // 持卡人名称
     private String name;
+    // 卡余额
+    private Long amount;
     public UserCardDTO() {
     }
-    public UserCardDTO(Long accountId, String cardNo) {
-        this.accountId = accountId;
-        this.cardNo = cardNo;
-    }
-
-    public UserCardDTO(Long customerId, Long accountId, String cardNo, String name) {
+    public UserCardDTO(Long customerId, Long accountId, String cardNo, String name, Long amount) {
         this.customerId = customerId;
         this.accountId = accountId;
         this.cardNo = cardNo;
         this.name = name;
+        this.amount = amount;
     }
     public Long getCustomerId() {
@@ -59,4 +57,12 @@ public class UserCardDTO {
     public void setName(String name) {
         this.name = name;
     }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
 }
@@ -44,9 +44,7 @@ public enum CashierType implements IEnumType {
     public static CashierType getIfNonNull(Integer code) {
         if (Objects.nonNull(code)) {
-            Stream<CashierType> TYPES = Arrays.stream(CashierType.values());
-            return TYPES.filter(type -> type.getCode() == code).findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("Invalid cashier desk"));
+            return getByCode(code);
         }
         return null;
     }
@@ -3,6 +3,7 @@ package com.diligrp.cashier.pipeline.type;
 import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
 import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.type.IEnumType;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
 import java.util.Optional;
@@ -58,6 +59,7 @@ public enum OutPaymentType implements IEnumType {
     }
     @Override
+    @JsonValue
     public int getCode() {
         return code;
     }
@@ -30,10 +30,10 @@ public class PlatformServiceException extends RuntimeException {
         super(message, ex);
     }
-//    @Override
-//    public Throwable fillInStackTrace() {
-//        return stackTrace ? super.fillInStackTrace() : this;
-//    }
+    @Override
+    public Throwable fillInStackTrace() {
+        return stackTrace ? super.fillInStackTrace() : this;
+    }
     public String getCode() {
         return code;
@@ -23,6 +23,8 @@ public class CashierOrderBO {
     private String description;
     // 附加数据
     private String attach;
+    // 订单来源
+    private Integer source;
     public Long getMchId() {
         return mchId;
@@ -111,4 +113,12 @@ public class CashierOrderBO {
     public void setAttach(String attach) {
         this.attach = attach;
     }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
 }
-package com.diligrp.cashier.trade.type;
-
-import com.diligrp.cashier.shared.type.IEnumType;
+package com.diligrp.cashier.shared.type;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
@@ -12,13 +11,7 @@ import java.util.stream.Stream;
  */
 public enum SourceType implements IEnumType {
-    PC("PC端", 1),
-
-    MINIPRO("小程序端", 2),
-
-    APP("APP端", 3),
-
-    ATM("自助机", 4);
+    RTMARK("大润发商城", 10);
     private final String name;
     private final int code;
@@ -37,6 +30,17 @@ public enum SourceType implements IEnumType {
         return TYPES.filter(type -> type.getCode() == code).findFirst();
     }
+    public static SourceType getByCode(int code) {
+        return getType(code).orElseThrow(() -> new IllegalArgumentException("系统暂不支持此订单来源"));
+    }
+
+    public static SourceType getIfNonNull(Integer code) {
+        if (Objects.nonNull(code)) {
+            return getByCode(code);
+        }
+        return null;
+    }
+
     public static String getName(int code) {
         return getType(code).map(SourceType::getName).orElse(null);
     }
 package com.diligrp.cashier.trade.domain;
 import com.diligrp.cashier.pipeline.type.CashierType;
+import com.diligrp.cashier.shared.type.SourceType;
 public class CashierOrder {
     // 业务系统用户标识
@@ -23,6 +24,8 @@ public class CashierOrder {
     private String description;
     // 附加数据
     private String attach;
+    // 订单来源
+    private SourceType source;
     public String getUserId() {
         return userId;
@@ -103,4 +106,12 @@ public class CashierOrder {
     public void setAttach(String attach) {
         this.attach = attach;
     }
+
+    public SourceType getSource() {
+        return source;
+    }
+
+    public void setSource(SourceType source) {
+        this.source = source;
+    }
 }
@@ -33,7 +33,7 @@ public class TaskMessageSender {
      */
     public void sendDelayTaskMessage(TaskMessage task, long delayInMillis) {
         if (delayInMillis < 0) {
-            LOG.info("No need send scan order message[type={}]", task.getType());
+            LOG.info("No need send scan order message: {}", task);
             return;
         }
 package com.diligrp.cashier.trade.model;
+import com.diligrp.cashier.pipeline.type.CashierType;
 import com.diligrp.cashier.shared.domain.BaseDO;
+import com.diligrp.cashier.shared.type.SourceType;
 import java.time.LocalDateTime;
@@ -154,8 +156,8 @@ public class TradeOrder extends BaseDO {
             return this;
         }
-        public Builder type(Integer type) {
-            TradeOrder.this.type = type;
+        public Builder type(CashierType type) {
+            TradeOrder.this.type = type.getCode();
             return this;
         }
@@ -204,8 +206,8 @@ public class TradeOrder extends BaseDO {
             return this;
         }
-        public Builder source(Integer source) {
-            TradeOrder.this.source = source;
+        public Builder source(SourceType source) {
+            TradeOrder.this.source = source != null ? source.getCode() : null;
             return this;
         }
@@ -69,7 +69,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
                     if (!PaymentState.isFinished(response.getState().getCode())) {
                         try {
                             onlinePipeline.closePrepayOrder(order);
-                            LOG.debug("scanCashierTradeOrder: close online prepay order {}", payment.getPaymentId());
+                            LOG.info("scanCashierTradeOrder: close online prepay order {}", payment.getPaymentId());
                             response = new OnlinePaymentResponse(response.getPaymentId(), response.getOutTradeNo(),
                                 response.getOutPayType(), response.getPayerId(), response.getWhen(),
                                 PaymentState.FAILED, "自动关闭超时的支付订单");
@@ -85,6 +85,7 @@ public class CashierAssistantServiceImpl implements ICashierAssistantService {
             if (!TradeState.isFinished(trade.getState())) {
                 TradeStateDTO tradeStateDTO = TradeStateDTO.of(trade.getTradeId(), TradeState.CLOSED, trade.getVersion(), now);
                 tradeAssistantService.proceedTradeOrder(tradeStateDTO);
+                LOG.info("scanCashierTradeOrder: close cashier trade order {}", tradeId);
             }
         } finally {
             if (lock.isHeldByCurrentThread()) {
@@ -14,7 +14,7 @@ import com.diligrp.cashier.pipeline.type.OutPaymentType;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.pipeline.type.PaymentType;
 import com.diligrp.cashier.shared.ErrorCode;
-import com.diligrp.cashier.shared.util.DateUtils;
+import com.diligrp.cashier.shared.type.SourceType;
 import com.diligrp.cashier.trade.Constants;
 import com.diligrp.cashier.trade.dao.IOnlinePaymentDao;
 import com.diligrp.cashier.trade.dao.ITradeOrderDao;
@@ -89,10 +89,10 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         int timeout = Objects.isNull(cashierOrder.getTimeout()) ? Constants.DEFAULT_TRADE_TIMEOUT : cashierOrder.getTimeout();
         timeout = Math.min(Math.max(timeout, Constants.MIN_TRADE_TIMEOUT),  Constants.MAX_TRADE_TIMEOUT);
         TradeOrder tradeOrder = TradeOrder.builder().mchId(merchant.getMchId()).tradeId(tradeId)
-            .type(cashierOrder.getType().getCode()).outTradeNo(cashierOrder.getOutTradeNo()).amount(cashierOrder.getAmount())
+            .type(cashierOrder.getType()).outTradeNo(cashierOrder.getOutTradeNo()).amount(cashierOrder.getAmount())
             .maxAmount(cashierOrder.getAmount()).goods(cashierOrder.getGoods()).timeout(timeout).state(TradeState.PENDING.getCode())
             .notifyUrl(cashierOrder.getNotifyUrl()).description(cashierOrder.getDescription()).attach(cashierOrder.getAttach())
-            .source(0).version(0).createdTime(now).modifiedTime(now).build();
+            .source(cashierOrder.getSource()).version(0).createdTime(now).modifiedTime(now).build();
         tradeOrderDao.insertTradeOrder(tradeOrder);
         // 兜底处理交易订单，根据支付结果选择关闭或完成交易订单
@@ -152,6 +152,8 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
                 } else if (pipeline instanceof DiliCardPipeline cardPipeline) { // 园区卡支付通道
                     // 园区卡支付通道: 所有的收银台类型使用的是同一种园区卡支付流程
                     CardPaymentRequest request = new CardPaymentConverter(trade, paymentId, now).convert(cashierPayment);
+                    // 园区卡支付需要订单来源
+                    request.attach("source", SourceType.getIfNonNull(trade.getSource()));
                     // 修改支付状态为支付中，防止重复支付
                     CardPaymentResponse response = cardPipeline.sendPaymentRequest(request);
                     // 支付成功插入支付记录并修改交易订单状态，失败可以继续支付
@@ -298,13 +300,9 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
         // 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) {
-                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) {
-                CardPaymentResponse response = pipeline.queryPaymentResponse(order);
+            PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), PaymentPipeline.class);
+            if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                OnlinePaymentResponse response = onlinePipeline.queryPrepayResponse(order);
                 return OnlinePaymentResult.of(trade.getTradeId(), paymentId, response.getState(), trade.getOutTradeNo(),
                     response.getOutPayType(), response.getPayerId(), response.getWhen(), response.getMessage());
             }
@@ -351,17 +349,18 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             .state(response.getState()).description(request.getDescription()).version(0).createdTime(now).modifiedTime(now).build();
         onlinePaymentDao.insertOnlinePayment(refund);
-        if (PaymentState.SUCCESS.equalTo(response.getState())) {
+        if (response.getState() == PaymentState.SUCCESS) {
             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())) {
+        } else if (!PaymentState.isFinished(response.getState().getCode())) {
             // 固定周期后，查询退款状态，根据状态完成退款订单
             TaskMessage message = new TaskMessage(TaskMessage.TYPE_CASHIER_REFUND_SCAN, refundId, "1");
             taskMessageSender.sendDelayTaskMessage(message, trade.getTimeout() * 1000);
         }
-        return new OnlineRefundResult(refundId, payment.getPaymentId(), response.getState(), response.getWhen(), response.getMessage());
+        return new OnlineRefundResult(refundId, payment.getPaymentId(), response.getState().getCode(),
+            response.getWhen(), response.getMessage());
     }
     @Override
@@ -372,7 +371,7 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             LOG.warn("Duplicate process online refund order[{}:{}]", response.getRefundId(), response.getState());
             return;
         }
-        if (!PaymentState.isFinished(response.getState())) {
+        if (!PaymentState.isFinished(response.getState().getCode())) {
             LOG.warn("Ignore online refund order[{}:{}]", response.getRefundId(), response.getState());
             return;
         }
@@ -385,14 +384,14 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             .description(response.getMessage()).version(refund.getVersion()).modifiedTime(now).build();
         tradeAssistantService.proceedOnlinePayment(refundDTO);
-        if (PaymentState.SUCCESS.equalTo(response.getState())) {
+        if (response.getState() == PaymentState.SUCCESS) {
             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());
+            response.getState().getCode(), response.getWhen(), response.getMessage());
         paymentResultManager.notifyRefundResult(refund.getNotifyUrl(), refundResult);
     }
@@ -407,7 +406,8 @@ public class CashierPaymentServiceImpl implements ICashierPaymentService {
             if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
                 OnlineRefundOrder order = new OnlineRefundOrder(refundId, refund.getOutTradeNo());
                 OnlineRefundResponse response = onlinePipeline.queryRefundResponse(order);
-                return new OnlineRefundResult(refundId, refund.getObjectId(), response.getState(), response.getWhen(), response.getMessage());
+                return new OnlineRefundResult(refundId, refund.getObjectId(), response.getState().getCode(),
+                    response.getWhen(), response.getMessage());
             }
         }
         return new OnlineRefundResult(refundId, refund.getObjectId(), refund.getState(), refund.getFinishTime(), refund.getDescription());
@@ -7,6 +7,5 @@ public enum SnowflakeKey implements SnowflakeKeyManager.SnowflakeKey {
     PAYMENT_ID,
     MALL_BIZ_ORDER_ID,
     MALL_BIZ_PAYMENT_ID,
-    MALL_BIZ_REFUND_ID,
-    ;
+    MALL_BIZ_REFUND_ID;
 }
@@ -2,10 +2,9 @@ package com.diligrp.cashier.trade.util;
 import com.diligrp.cashier.pipeline.domain.card.CardPaymentRequest;
 import com.diligrp.cashier.shared.codec.IConverter;
+import com.diligrp.cashier.shared.util.AssertUtils;
 import com.diligrp.cashier.trade.domain.CashierPayment;
-import com.diligrp.cashier.trade.model.OnlinePayment;
 import com.diligrp.cashier.trade.model.TradeOrder;
-import org.springframework.util.Assert;
 import java.time.LocalDateTime;
 import java.util.Map;
@@ -16,6 +15,8 @@ public class CardPaymentConverter implements IConverter&lt;CashierPayment, CardPaym
     private static final String PARAM_CARD_NO = "cardNo";
+    private static final String PARAM_PASSWORD = "password";
+
     private final TradeOrder tradeOrder;
     private final String paymentId;
@@ -31,13 +32,15 @@ public class CardPaymentConverter implements IConverter&lt;CashierPayment, CardPaym
     @Override
     public CardPaymentRequest convert(CashierPayment payment) {
         Map<String, Object> params = payment.getParams();
-        Assert.notNull(params, "params missed");
-        Long accountId = (Long) payment.getParams().get(PARAM_ACCOUNT_ID);
+        AssertUtils.notNull(params, "params missed");
+        Long accountId = ((Number) payment.getParams().get(PARAM_ACCOUNT_ID)).longValue();
         String cardNo = (String) params.get(PARAM_CARD_NO);
-        Assert.notNull(accountId, "params.accountId missed");
-        Assert.notNull(cardNo, "params.cardNo missed");
+        String password = (String) params.get(PARAM_PASSWORD);
+        AssertUtils.notNull(accountId, "params.accountId missed");
+        AssertUtils.notEmpty(cardNo, "params.cardNo missed");
+        AssertUtils.notEmpty(password, "params.password missed");
         return new CardPaymentRequest(paymentId, tradeOrder.getMaxAmount(),
-            tradeOrder.getGoods(), tradeOrder.getDescription(), when, accountId, cardNo);
+            tradeOrder.getGoods(), tradeOrder.getDescription(), when, accountId, cardNo,  password);
     }
 }
@@ -8,4 +8,4 @@ INSERT INTO `dili_cashier`.upay_wechat_param(pipeline_id, mch_id, app_id, app_se
 VALUES(10011, '1679223106', 'wxca99d56a6ab15f29', '9c254c0ab932b3c30292a05679a688f7', '60C2877836D1D618D2E40186995BB00299D92F44','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', 'RSfFvEBBQiHz8GZyDcP2eSUlZJgKjdxk', 2, now());
 -- 根据环境配置不同的uri
 INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
-VALUES (1001, 10012, 19, 2, '中瑞园区卡支付通道', 'http://10.28.3.9:8081', null, 1, now(), now());
+VALUES (1001, 10012, 19, 2, '中瑞园区卡支付通道', 'http://gateway.dev.nong12.com/pay-service', '{"outMchId": 9, "accountId": 118924}', 1, now(), now());