trade payment supported

huanggang
1 parent 1b8f43e7
Showing 77 changed files with 3078 additions and 285 deletions
cashier-assistant/src/main/java/com/diligrp/cashier/assistant/pattern/OptionToken.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/BossConfiguration.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/CashierDeskProperties.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/CashierServiceBootstrap.java
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/dao/IMerchantDao.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderDTO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderToken.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierPaymentUrl.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/exception/BossServiceException.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/model/MerchantDO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/ICashierDeskService.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/IMerchantService.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/MerchantServiceImpl.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/CashierOrderConverter.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/util/MerchantConverter.java
cashier-boss/src/main/resources/com/diligrp/cashier/dao/mapper/IMerchantDao.xml
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
@@ -15,7 +15,7 @@ public class OptionToken extends Token {
     @Override
     Converter<SequenceKey> getConverter() {
-        throw new AssistantServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "Not supported converter");
+        throw new AssistantServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "Not supported codec");
     }
     public String toString() {
 package com.diligrp.cashier.boss;
+import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
 import com.diligrp.cashier.shared.service.LifeCycle;
-import org.springframework.beans.BeansException;
+import jakarta.annotation.Resource;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import java.util.Map;
+import java.util.List;
 @Configuration
 @ComponentScan("com.diligrp.cashier.boss")
-public class BossConfiguration implements ApplicationContextAware, ApplicationRunner {
+@MapperScan(basePackages =  {"com.diligrp.cashier.boss.dao"}, markerInterface = MybatisMapperSupport.class)
+public class BossConfiguration implements ApplicationRunner {
-    private ApplicationContext applicationContext;
+    @Resource
+    private ObjectProvider<LifeCycle> lifeCycleProvider;
+
+    @Bean
+    @ConfigurationProperties("merchant")
+    public CashierDeskProperties cashierDeskProperties() {
+        return new CashierDeskProperties();
+    }
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        Map<String, LifeCycle> beans = applicationContext.getBeansOfType(LifeCycle.class);
-        for (LifeCycle lifeCycle : beans.values()) {
+        List<LifeCycle> lifeCycles = lifeCycleProvider.stream().toList();
+        for (LifeCycle lifeCycle : lifeCycles) {
             lifeCycle.start();
         }
     }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.applicationContext = applicationContext;
-    }
 }
+package com.diligrp.cashier.boss;
+
+import com.diligrp.cashier.trade.domain.MerchantParams;
+
+import javax.crypto.spec.SecretKeySpec;
+
+public class CashierDeskProperties {
+    // 密钥
+    private SecretKeySpec secretKey;
+    // 收银台配置
+    private MerchantParams.CashierParams cashier;
+
+    public SecretKeySpec getSecretKey() {
+        return secretKey;
+    }
+
+    public void setSecretKey(SecretKeySpec secretKey) {
+        this.secretKey = secretKey;
+    }
+
+    public MerchantParams.CashierParams getCashier() {
+        return cashier;
+    }
+
+    public void setCashier(MerchantParams.CashierParams cashier) {
+        this.cashier = cashier;
+    }
+}
@@ -4,6 +4,7 @@ import com.diligrp.cashier.assistant.AssistantConfiguration;
 import com.diligrp.cashier.mall.MallConfiguration;
 import com.diligrp.cashier.pipeline.PipelineConfiguration;
 import com.diligrp.cashier.shared.SharedConfiguration;
+import com.diligrp.cashier.trade.TradeConfiguration;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -12,13 +13,12 @@ import org.springframework.context.annotation.Import;
 @SpringBootConfiguration
 @EnableAutoConfiguration
-@Import({BossConfiguration.class, PipelineConfiguration.class,
-        AssistantConfiguration.class, SharedConfiguration.class,
-        MallConfiguration.class
+@Import({BossConfiguration.class, TradeConfiguration.class, PipelineConfiguration.class,
+        AssistantConfiguration.class, SharedConfiguration.class, MallConfiguration.class
 })
 @EnableDiscoveryClient
 public class CashierServiceBootstrap {
     public static void main(String[] args) {
         SpringApplication.run(CashierServiceBootstrap.class, args);
     }
-}
+}
 \ No newline at end of file
+package com.diligrp.cashier.boss;
+
+public final class Constants {
+    // 商户信息缓存Key
+    public static final String MERCHANT_REDIS_KEY = "cashier:merchant:%s";
+    // TOKEN信息缓存Key
+    public static final String TOKEN_REDIS_KEY = "cashier:token:%s";
+    // TOKEN参数名称
+    public static final String TOKEN_PARAM_NAME = "token";
+    // TOKEN签名算法
+    public static final String TOKEN_SIGN_ALGORITHM = "HmacSHA256";
+    // TOKEN的签名长度
+    public static final int TOKEN_SIGN_LENGTH = 8;
+    // TOKEN过期时长，单位秒
+    public static final long TOKEN_TIMEOUT_SECONDS = 60;
+}
+package com.diligrp.cashier.boss.controller;
+
+import com.diligrp.cashier.boss.domain.CashierOrderDTO;
+import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
+import com.diligrp.cashier.boss.service.ICashierDeskService;
+import com.diligrp.cashier.boss.service.IMerchantService;
+import com.diligrp.cashier.boss.util.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 jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/payment/cashier")
+public class CashierDeskController {
+
+    @Resource
+    private IMerchantService merchantService;
+
+    @Resource
+    private ICashierDeskService cashierDeskService;
+
+    @RequestMapping("/submitOrder")
+    public Message<?> submitOrder(@RequestBody CashierOrderDTO request) {
+        // 基本参数校验
+        AssertUtils.notNull(request.getMchId(), "mchId missed");
+        AssertUtils.notEmpty(request.getUserId(), "userId missed");
+        AssertUtils.notNull(request.getCashierType(), "cashierType missed");
+        AssertUtils.notEmpty(request.getGoods(), "goods missed");
+        AssertUtils.notNull(request.getAmount(), "amount missed");
+        AssertUtils.isTrue(request.getAmount() > 0, "Invalid amount");
+        AssertUtils.notEmpty(request.getOutTradeNo(), "outTradeNo missed");
+
+        CashierOrder cashierOrder = CashierOrderConverter.INSTANCE.convert(request);
+        Merchant merchant = merchantService.loadCashierMerchant(request.getMchId());
+        CashierPaymentUrl paymentUrl = cashierDeskService.doSubmit(merchant, cashierOrder);
+        return Message.success(paymentUrl);
+    }
+
+    @RequestMapping("/orderPayment")
+    public Message<?> orderPayment(@RequestBody CashierPayment request) {
+        // 基本参数校验
+        AssertUtils.notEmpty(request.getTradeId(), "paymentId missed");
+        AssertUtils.notNull(request.getPipelineId(), "pipelineId missed");
+
+        OnlinePaymentStatus paymentStatus = cashierDeskService.doPayment(request);
+        return Message.success(paymentStatus);
+    }
+}
+package com.diligrp.cashier.boss.dao;
+
+import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
+import com.diligrp.cashier.boss.model.MerchantDO;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+@Repository("merchantDao")
+public interface IMerchantDao extends MybatisMapperSupport {
+    Optional<MerchantDO> findByMchId(Long mchId);
+}
+package com.diligrp.cashier.boss.domain;
+
+public class CashierOrderDTO {
+    // 接入商户
+    private Long mchId;
+    // 业务系统用户标识
+    private String userId;
+    // 收银台类型 - H5收银台等
+    private Integer cashierType;
+    // 商品描述
+    private String goods;
+    // 申请金额
+    private Long amount;
+    // 超时间隔时间 - 秒
+    private Integer timeout;
+    // 外部流水号
+    private String outTradeNo;
+    // 回调地址
+    private String notifyUrl;
+    // 交易描述
+    private String description;
+    // 附加数据
+    private String attach;
+
+    public Long getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(Long mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public Integer getCashierType() {
+        return cashierType;
+    }
+
+    public void setCashierType(Integer cashierType) {
+        this.cashierType = cashierType;
+    }
+
+    public String getGoods() {
+        return goods;
+    }
+
+    public void setGoods(String goods) {
+        this.goods = goods;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(Integer timeout) {
+        this.timeout = timeout;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public void setAttach(String attach) {
+        this.attach = attach;
+    }
+}
+package com.diligrp.cashier.boss.domain;
+
+import com.diligrp.cashier.boss.Constants;
+import com.diligrp.cashier.boss.exception.BossServiceException;
+import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.security.Base62Cipher;
+import com.diligrp.cashier.shared.security.HexUtils;
+import com.diligrp.cashier.shared.util.JsonUtils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.util.Objects;
+
+public class CashierOrderToken {
+    // 商户号
+    private Long mchId;
+    // 交易ID
+    private String tradeId;
+    // 收银台类型
+    private Integer cashierType;
+    // 业务系统用户标识
+    private String userId;
+
+    public static String encode(Long tokenId, SecretKeySpec secretKey) {
+        try {
+            String payload = Base62Cipher.encodeLong(tokenId);
+            Mac mac = Mac.getInstance(Constants.TOKEN_SIGN_ALGORITHM);
+            mac.init(secretKey);
+
+            byte[] bytes = mac.doFinal(payload.getBytes(StandardCharsets.UTF_8));
+            String signature = HexUtils.encodeHexStr(bytes).substring(0, Constants.TOKEN_SIGN_LENGTH);
+            payload = payload + signature;
+            return payload;
+        }  catch (Exception ex) {
+            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "Failed to generate order token");
+        }
+    }
+
+    public static long decode(String token, SecretKeySpec secretKey) {
+        if (token == null || token.length() <= Constants.TOKEN_SIGN_LENGTH) {
+            throw new BossServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "Invalid order token");
+        }
+
+        String payload = token.substring(0, token.length() - Constants.TOKEN_SIGN_LENGTH);
+        String signature = token.substring(token.length() - Constants.TOKEN_SIGN_LENGTH);
+        String tokenSign;
+        try {
+            Mac mac = Mac.getInstance(Constants.TOKEN_SIGN_ALGORITHM);
+            mac.init(secretKey);
+            byte[] bytes = mac.doFinal(payload.getBytes(StandardCharsets.UTF_8));
+            tokenSign = HexUtils.encodeHexStr(bytes).substring(0, Constants.TOKEN_SIGN_LENGTH);
+        } catch (Exception ex) {
+            throw new BossServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "Invalid order token");
+        }
+
+        if (!Objects.equals(signature, tokenSign)) {
+            throw new BossServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "Invalid order token signature");
+        }
+        return Base62Cipher.decodeLong(payload);
+    }
+
+    public static CashierOrderToken decode(String payload) {
+        if (payload != null) {
+            return JsonUtils.fromJsonString(payload, CashierOrderToken.class);
+        }
+        return null;
+    }
+
+    public CashierOrderToken() {
+    }
+
+    public CashierOrderToken(Long mchId, String tradeId, Integer cashierType, String userId) {
+        this.mchId = mchId;
+        this.tradeId = tradeId;
+        this.cashierType = cashierType;
+        this.userId = userId;
+    }
+
+    public Long getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(Long mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Integer getCashierType() {
+        return cashierType;
+    }
+
+    public void setCashierType(Integer cashierType) {
+        this.cashierType = cashierType;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String toString() {
+        return JsonUtils.toJsonString(this);
+    }
+}
+package com.diligrp.cashier.boss.domain;
+
+/**
+ * @param tradeId  交易号
+ * @param paymentUrl 收银台支付链接
+ */
+public record CashierPaymentUrl(String tradeId, String paymentUrl) {
+}
+package com.diligrp.cashier.boss.exception;
+
+import com.diligrp.cashier.shared.exception.PlatformServiceException;
+
+public class BossServiceException extends PlatformServiceException {
+    public BossServiceException(String message) {
+        super(message);
+    }
+
+    public BossServiceException(String code, String message) {
+        super(code, message);
+    }
+
+    public BossServiceException(String message, Throwable ex) {
+        super(message, ex);
+    }
+}
+package com.diligrp.cashier.boss.model;
+
+import com.diligrp.cashier.shared.domain.BaseDO;
+
+import java.time.LocalDateTime;
+
+public class MerchantDO extends BaseDO {
+    // 商户ID
+    private Long mchId;
+    // 商户名称
+    private String name;
+    // 参数配置
+    private String param;
+    // 商户地址
+    private String address;
+    // 联系人
+    private String linkman;
+    // 手机号
+    private String telephone;
+    // 商户状态
+    private Integer state;
+
+    public Long getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(Long mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getParam() {
+        return param;
+    }
+
+    public void setParam(String param) {
+        this.param = param;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLinkman() {
+        return linkman;
+    }
+
+    public void setLinkman(String linkman) {
+        this.linkman = linkman;
+    }
+
+    public String getTelephone() {
+        return telephone;
+    }
+
+    public void setTelephone(String telephone) {
+        this.telephone = telephone;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public static Builder builder() {
+        return new MerchantDO().new Builder();
+    }
+
+    public class Builder {
+        public Builder mchId(Long mchId) {
+            MerchantDO.this.mchId = mchId;
+            return this;
+        }
+
+        public Builder name(String name) {
+            MerchantDO.this.name = name;
+            return this;
+        }
+
+        public Builder param(String param) {
+            MerchantDO.this.param = param;
+            return this;
+        }
+
+        public Builder address(String address) {
+            MerchantDO.this.address = address;
+            return this;
+        }
+
+        public Builder linkman(String linkman) {
+            MerchantDO.this.linkman = linkman;
+            return this;
+        }
+
+        public Builder telephone(String telephone) {
+            MerchantDO.this.telephone = telephone;
+            return this;
+        }
+
+        public Builder state(Integer state) {
+            MerchantDO.this.state = state;
+            return this;
+        }
+
+        public Builder createdTime(LocalDateTime createdTime) {
+            MerchantDO.this.createdTime = createdTime;
+            return this;
+        }
+
+        public Builder modifiedTime(LocalDateTime modifiedTime) {
+            MerchantDO.this.modifiedTime = modifiedTime;
+            return this;
+        }
+
+        public MerchantDO build() {
+            return MerchantDO.this;
+        }
+    }
+}
+package com.diligrp.cashier.boss.service;
+
+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;
+
+public interface ICashierDeskService {
+    /**
+     * 提交收银台订单
+     *
+     * @param merchant - 接入商户
+     * @param order - 交易订单
+     * @return 交易订单
+     */
+    CashierPaymentUrl doSubmit(Merchant merchant, CashierOrder order);
+
+    /**
+     * 提交收银台支付
+     *
+     * @param payment - 支付信息
+     * @return 支付状态
+     */
+    OnlinePaymentStatus doPayment(CashierPayment payment);
+}
+package com.diligrp.cashier.boss.service;
+
+import com.diligrp.cashier.trade.domain.Merchant;
+
+public interface IMerchantService {
+
+    Merchant loadCashierMerchant(Long mchId);
+}
+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.CashierOrderToken;
+import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
+import com.diligrp.cashier.boss.service.ICashierDeskService;
+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.trade.service.ICashierPaymentService;
+import jakarta.annotation.Resource;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+@Service("cashierDeskService")
+public class CashierDeskServiceImpl implements ICashierDeskService {
+
+    @Resource
+    private ICashierPaymentService cashierPaymentService;
+
+    @Resource
+    private CashierDeskProperties cashierDeskProperties;
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    /**
+     * 提交收银台订单
+     *
+     * @param merchant - 接入商户
+     * @param order - 交易订单
+     * @return 交易订单
+     */
+    @Override
+    public CashierPaymentUrl doSubmit(Merchant merchant, CashierOrder order) {
+        String tradeId = cashierPaymentService.doSubmit(merchant, order);
+        String token = CashierOrderToken.encode(Long.valueOf(tradeId), cashierDeskProperties.getSecretKey());
+        CashierOrderToken orderToken = new CashierOrderToken(merchant.getMchId(), tradeId, order.getType().getCode(), order.getUserId());
+
+        String tokenKey = String.format(Constants.TOKEN_REDIS_KEY, token);
+        stringRedisTemplate.opsForValue().set(tokenKey, orderToken.toString(), Constants.TOKEN_TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        MerchantParams params = merchant.getParams();
+        String paymentUrl = switch (order.getType()) {
+            case MINIPRO -> String.format("%s?%s=%s", params.getCashier().getMiniProUrl(), Constants.TOKEN_PARAM_NAME, token);
+            case H5 ->  String.format("%s?%s=%s", params.getCashier().getH5Url(), Constants.TOKEN_PARAM_NAME, token);
+            case APP ->  String.format("%s?%s=%s", params.getCashier().getAppUrl(), Constants.TOKEN_PARAM_NAME, token);
+            default -> String.format("%s?%s=%s", params.getCashier().getPcUrl(), Constants.TOKEN_PARAM_NAME, token);
+        };
+        return new CashierPaymentUrl(tradeId, paymentUrl);
+    }
+
+    /**
+     * 提交收银台支付
+     *
+     * @param payment - 支付信息
+     * @return 支付状态
+     */
+    @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);
+    }
+}
+package com.diligrp.cashier.boss.service.impl;
+
+import com.diligrp.cashier.boss.CashierDeskProperties;
+import com.diligrp.cashier.boss.Constants;
+import com.diligrp.cashier.boss.dao.IMerchantDao;
+import com.diligrp.cashier.boss.exception.BossServiceException;
+import com.diligrp.cashier.boss.service.IMerchantService;
+import com.diligrp.cashier.boss.util.MerchantConverter;
+import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.trade.domain.Merchant;
+import jakarta.annotation.Resource;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * 支付平台接入许可服务
+ */
+@Service("merchantService")
+public class MerchantServiceImpl implements IMerchantService {
+
+    @Resource
+    private IMerchantDao merchantDao;
+
+    @Resource
+    private CashierDeskProperties cashierDeskProperties;
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    @Override
+    public Merchant loadCashierMerchant(Long mchId) {
+        String cacheKey = String.format(Constants.MERCHANT_REDIS_KEY, mchId);
+        String payload = stringRedisTemplate.opsForValue().get(cacheKey);
+        Merchant merchant = Merchant.decode(payload);
+        if (Objects.isNull(merchant)) {
+            merchant = merchantDao.findByMchId(mchId).map(new MerchantConverter(cashierDeskProperties)::convert)
+                .orElseThrow(() -> new BossServiceException(ErrorCode.OBJECT_NOT_FOUND, "商家信息未注册"));
+            stringRedisTemplate.opsForValue().set(cacheKey, merchant.toString());
+        }
+
+        return merchant;
+    }
+}
+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.trade.domain.CashierOrder;
+
+public class CashierOrderConverter implements IConverter<CashierOrderDTO, CashierOrder> {
+
+    public static IConverter<CashierOrderDTO, CashierOrder> INSTANCE = new CashierOrderConverter();
+
+    @Override
+    public CashierOrder convert(CashierOrderDTO cashierOrderDTO) {
+        CashierOrder cashierOrder = new CashierOrder();
+        cashierOrder.setUserId(cashierOrderDTO.getUserId());
+        cashierOrder.setType(CashierType.getByCode(cashierOrderDTO.getCashierType()));
+        cashierOrder.setGoods(cashierOrderDTO.getGoods());
+        cashierOrder.setAmount(cashierOrderDTO.getAmount());
+        cashierOrder.setTimeout(cashierOrderDTO.getTimeout());
+        cashierOrder.setOutTradeNo(cashierOrderDTO.getOutTradeNo());
+        cashierOrder.setNotifyUrl(cashierOrderDTO.getNotifyUrl());
+        cashierOrder.setDescription(cashierOrderDTO.getDescription());
+        cashierOrder.setAttach(cashierOrderDTO.getAttach());
+        return cashierOrder;
+    }
+}
+package com.diligrp.cashier.boss.util;
+
+import com.diligrp.cashier.boss.CashierDeskProperties;
+import com.diligrp.cashier.boss.model.MerchantDO;
+import com.diligrp.cashier.shared.codec.IConverter;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import com.diligrp.cashier.trade.domain.Merchant;
+import com.diligrp.cashier.trade.domain.MerchantParams;
+
+import java.util.Objects;
+
+public class MerchantConverter implements IConverter<MerchantDO, Merchant> {
+
+    private final CashierDeskProperties cashierProperties;
+
+    public MerchantConverter(CashierDeskProperties cashierProperties) {
+        this.cashierProperties = cashierProperties;
+    }
+
+    @Override
+    public Merchant convert(MerchantDO merchantDO) {
+        Merchant merchant = new Merchant();
+        merchant.setMchId(merchantDO.getMchId());
+        merchant.setName(merchantDO.getName());
+        if (Objects.nonNull(merchantDO.getParam())) {
+            merchant.setParams(JsonUtils.fromJsonString(merchantDO.getParam(), MerchantParams.class));
+        } else {
+            merchant.setParams(new MerchantParams());
+        }
+        MerchantParams params = merchant.getParams();
+
+        if (Objects.isNull(params.getCashier())) {
+            params.setCashier(new MerchantParams.CashierParams());
+        }
+        params.getCashier().override(cashierProperties.getCashier());
+
+        return merchant;
+    }
+}
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.diligrp.cashier.boss.dao.IMerchantDao">
+    <resultMap id="MerchantMap" type="com.diligrp.cashier.boss.model.MerchantDO">
+        <result column="id" property="id"/>
+        <result column="mch_id" property="mchId"/>
+        <result column="name" property="name"/>
+        <result column="param" property="param"/>
+        <result column="address" property="address"/>
+        <result column="linkman" property="linkman"/>
+        <result column="telephone" property="telephone"/>
+        <result column="state" property="state"/>
+        <result column="created_time" property="createdTime"/>
+        <result column="modified_time" property="modifiedTime"/>
+    </resultMap>
+
+    <select id="findByMchId" parameterType="long" resultMap="MerchantMap">
+        SELECT * FROM upay_merchant WHERE mch_id = #{mchId}
+    </select>
+</mapper>
 package com.diligrp.cashier.pipeline.client;
 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.type.PaymentState;
 import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
 import org.slf4j.Logger;
@@ -20,11 +22,11 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
         this.baseUri = baseUri;
     }
-    public OnlinePaymentResponse sendPaymentRequest(OnlinePaymentRequest request) {
+    public CardPaymentResponse sendPaymentRequest(CardPaymentRequest request) {
         return null;
     }
-    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder order) {
+    public CardPaymentResponse queryPaymentResponse(OnlinePrepayOrder order) {
         return null;
     }
@@ -68,7 +68,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
         verifyHttpResult(result);
         if (result.statusCode == 200) { // 200 处理成功有返回，204处理成功无返回
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
-            return NativePrepayResponse.of(request.getPaymentId(), null, (String) response.get("code_url"));
+            return NativePrepayResponse.of(request.getPaymentId(), (String) response.get("code_url"));
         } else {
             LOG.error("Wechat native prepay failed: {}\n{}", result.statusCode, result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
@@ -131,7 +131,7 @@ public class WechatDirectHttpClient extends WechatHttpClient {
             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.getCode(), (String) response.get("trade_state_desc"));
+                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);
@@ -69,7 +69,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
         verifyHttpResult(result);
         if (result.statusCode == 200) { // 200 处理成功有返回，204处理成功无返回
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
-            return NativePrepayResponse.of(request.getPaymentId(), null, (String) response.get("code_url"));
+            return NativePrepayResponse.of(request.getPaymentId(), (String) response.get("code_url"));
         } else {
             LOG.error("Wechat native prepay failed: {}\n{}", result.statusCode, result.responseText);
             ErrorMessage message = JsonUtils.fromJsonString(result.responseText, ErrorMessage.class);
@@ -135,7 +135,7 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
             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.getCode(), (String) response.get("trade_state_desc"));
+                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);
-package com.diligrp.cashier.pipeline.core;
-
-import com.diligrp.cashier.pipeline.client.CardPaymentHttpClient;
-import com.diligrp.cashier.pipeline.domain.*;
-import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
-import com.diligrp.cashier.shared.ErrorCode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 园区卡支付通道抽象模型
- */
-public abstract class CardPipeline extends PaymentPipeline<CardPipeline.CardParams> {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CardPipeline.class);
-
-    private final ScanTimeStrategy strategy;
-
-    private final CardPaymentHttpClient client;
-
-    public CardPipeline(long mchId, long pipelineId, String name, String uri, String params) throws Exception {
-        super(mchId, pipelineId, name, uri, params);
-        this.strategy = new DefaultTimeStrategy();
-        this.client = new CardPaymentHttpClient(uri);
-    }
-
-    /**
-     * 发送预支付订单的支付申请 - 目前针对园区卡扫码支付
-     */
-    public OnlinePaymentResponse sendPaymentRequest(OnlinePaymentRequest request) {
-        try {
-            return client.sendPaymentRequest(request);
-        } catch (PaymentPipelineException | IllegalArgumentException pse) {
-            throw pse;
-        } catch (Exception ex) {
-            LOG.error("Send card payment request exception", ex);
-            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起地利支付申请失败");
-        }
-    }
-
-    /**
-     * 查询支付订单状态
-     */
-    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder order) {
-        try {
-            return client.queryPrepayResponse(order);
-        } 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 void closePrepayOrder(OnlinePrepayOrder request) {
-        // 不调用远程关单接口
-    }
-
-    /**
-     * 退款申请
-     */
-    public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
-        try {
-            return client.sendRefundRequest(request);
-        } catch (PaymentPipelineException | IllegalArgumentException pse) {
-            throw pse;
-        } catch (Exception ex) {
-            LOG.error("Send card refund request exception", ex);
-            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信退款失败");
-        }
-    }
-
-    public CardPaymentHttpClient getClient() {
-        return this.client;
-    }
-
-    public ScanTimeStrategy getTimeStrategy() {
-        return strategy;
-    }
-
-    @Override
-    public Class<CardParams> paramClass() {
-        return CardParams.class;
-    }
-
-    public static class CardParams extends PipelineParams {
-        public CardParams(String params) {
-            super(params);
-        }
-    }
-}
 package com.diligrp.cashier.pipeline.core;
+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;
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 /**
- * 地利园区支付通道模型
+ * 地利园区卡支付通道模型
  */
-public class DiliCardPipeline extends CardPipeline {
+public class DiliCardPipeline extends OnlinePipeline<DiliCardPipeline.CardParams> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(DiliCardPipeline.class);
+
+    private final ScanTimeStrategy strategy;
+
+    private final CardPaymentHttpClient client;
     public DiliCardPipeline(long mchId, long pipelineId, String name, String uri, String params) throws Exception {
         super(mchId, pipelineId, name, uri, params);
+        this.strategy = new DefaultTimeStrategy();
+        this.client = new CardPaymentHttpClient(uri);
+    }
+
+    /**
+     * 发送预支付订单的支付申请 - 目前针对园区卡扫码支付
+     */
+    public CardPaymentResponse sendPaymentRequest(CardPaymentRequest request) {
+        try {
+            return client.sendPaymentRequest(request);
+        } catch (PaymentPipelineException | IllegalArgumentException pse) {
+            throw pse;
+        } catch (Exception ex) {
+            LOG.error("Send card payment request exception", ex);
+            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起地利支付申请失败");
+        }
+    }
+
+    /**
+     * 查询支付订单状态
+     */
+    public CardPaymentResponse queryPaymentResponse(OnlinePrepayOrder order) {
+        try {
+            return client.queryPaymentResponse(order);
+        } 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 void closePrepayOrder(OnlinePrepayOrder request) {
+        // 不调用远程关单接口
+    }
+
+    /**
+     * 退款申请
+     */
+    public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
+        try {
+            return client.sendRefundRequest(request);
+        } catch (PaymentPipelineException | IllegalArgumentException pse) {
+            throw pse;
+        } catch (Exception ex) {
+            LOG.error("Send card refund request exception", ex);
+            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发起微信退款失败");
+        }
     }
     @Override
     public ChannelType supportedChannel() {
         return ChannelType.DILIPAY;
     }
+
+    public ScanTimeStrategy getTimeStrategy() {
+        return strategy;
+    }
+
+    @Override
+    public Class<CardParams> paramClass() {
+        return CardParams.class;
+    }
+
+    public static class CardParams extends PipelineParams {
+        // 园区卡所属市场
+        private String outMchId;
+
+        public CardParams(String params) {
+            super(params);
+        }
+
+        public String getOutMchId() {
+            return outMchId;
+        }
+
+        public void setOutMchId(String outMchId) {
+            this.outMchId = outMchId;
+        }
+    }
 }
@@ -5,9 +5,7 @@ import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
 import com.diligrp.cashier.shared.ErrorCode;
 /**
- * 在线支付通道抽象模型
- *
- * TODO: 此支付通道类是否所有支付通道的基类(微信、支付宝、银行聚合支付），还是仅仅作为银行聚合支付的基类，需要仔细斟酌
+ * 在线支付通道抽象模型: 支持微信、支付宝、各类银行聚合支付, 但不包括园区卡支付通道
  */
 public abstract class OnlinePipeline<T extends PaymentPipeline.PipelineParams> extends PaymentPipeline<T> {
@@ -23,17 +21,17 @@ public abstract class OnlinePipeline&lt;T extends PaymentPipeline.PipelineParams&gt; e
     }
     /**
-     * 付款码支付 - 商户扫客户付款码
+     * 小程序支付
      */
-    public OnlinePaymentResponse sendQrCodePaymentRequest(OnlinePaymentRequest request) {
-        throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "支付通道暂不支持付款码支付");
+    public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
+        throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "支付通道暂不支持小程序支付");
     }
     /**
-     * 小程序支付
+     * 直接支付 - 比如: 微信付款码, 园区卡支付等
      */
-    public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
-        throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "支付通道暂不支持小程序支付");
+    public OnlinePaymentResponse sendQrCodePaymentRequest(QrCodePaymentRequest request) {
+        throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "支付通道暂不支持付款码支付");
     }
     /**
@@ -8,6 +8,12 @@ import com.diligrp.cashier.shared.util.ObjectUtils;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+/**
+ * 所有支付通道的基类, 目前分两类支付通道: 在线支付通道、园区卡支付通道
+ *
+ * 在线支付通道支持: 微信支付、支付宝、各类银行聚合支付
+ * 园区卡支付通道是指地利一卡通支付
+ */
 public abstract class PaymentPipeline<T extends PaymentPipeline.PipelineParams> implements IPipeline<T> {
     // 通道所属商户
     private final long mchId;
@@ -97,14 +97,6 @@ public abstract class WechatPipeline extends OnlinePipeline&lt;WechatPipeline.Wecha
     }
     /**
-     * 付款码支付 - 商户扫客户付款码
-     */
-    @Override
-    public OnlinePaymentResponse sendQrCodePaymentRequest(OnlinePaymentRequest request) {
-        return super.sendQrCodePaymentRequest(request);
-    }
-
-    /**
      * 小程序预支付下单
      */
     public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
@@ -129,6 +121,14 @@ public abstract class WechatPipeline extends OnlinePipeline&lt;WechatPipeline.Wecha
     }
     /**
+     * 付款码支付 - 商户扫客户付款码
+     */
+    @Override
+    public OnlinePaymentResponse sendQrCodePaymentRequest(QrCodePaymentRequest request) {
+        return super.sendQrCodePaymentRequest(request);
+    }
+
+    /**
      * 查询预支付订单状态
      */
     public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder order) {
 package com.diligrp.cashier.pipeline.domain;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+
 /**
  * 小程序预支付响应
  */
-public class MiniProPrepayResponse extends OnlinePrepayResponse {
+public class MiniProPrepayResponse extends OnlinePaymentStatus {
     // 微信预支付ID
     protected String prepayId;
     // 时间戳
@@ -17,16 +19,18 @@ public class MiniProPrepayResponse extends OnlinePrepayResponse {
     public static MiniProPrepayResponse of(String paymentId, String outTradeNo, String prepayId, String timeStamp,
                                            String nonceStr, String signType, String paySign) {
-        MiniProPrepayResponse response = new MiniProPrepayResponse();
-        response.paymentId = paymentId;
-        response.outTradeNo = outTradeNo;
-        response.prepayId = prepayId;
-        response.timeStamp = timeStamp;
-        response.nonceStr = nonceStr;
-        response.signType = signType;
-        response.paySign = paySign;
-
-        return response;
+        return new MiniProPrepayResponse(paymentId, outTradeNo, PaymentState.PROCESSING, prepayId, timeStamp,
+            nonceStr, signType, paySign);
+    }
+
+    public MiniProPrepayResponse(String paymentId, String outTradeNo, PaymentState state, String prepayId,
+                                 String timeStamp, String nonceStr, String signType, String paySign) {
+        super(paymentId, outTradeNo, state);
+        this.prepayId = prepayId;
+        this.timeStamp = timeStamp;
+        this.nonceStr = nonceStr;
+        this.signType = signType;
+        this.paySign = paySign;
     }
     public String getPrepayId() {
 package com.diligrp.cashier.pipeline.domain;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+
 /**
  * 扫码预支付响应
  */
-public class NativePrepayResponse extends OnlinePrepayResponse {
+public class NativePrepayResponse extends OnlinePaymentStatus {
     // 二维码链接
-    protected String codeUri;
+    protected String codeUrl;
+
+    public static NativePrepayResponse of(String paymentId, String codeUrl) {
+        return new NativePrepayResponse(paymentId, null, PaymentState.PROCESSING, codeUrl);
+    }
-    public static NativePrepayResponse of(String paymentId, String outTradeNo, String codeUri) {
-        NativePrepayResponse response = new NativePrepayResponse();
-        response.paymentId = paymentId;
-        response.outTradeNo = outTradeNo;
-        response.codeUri = codeUri;
-        return response;
+    public NativePrepayResponse(String paymentId, String outTradeNo, PaymentState state, String codeUrl) {
+        super(paymentId, outTradeNo, state);
+        this.codeUrl = codeUrl;
     }
-    public String getCodeUri() {
-        return codeUri;
+    public String getCodeUrl() {
+        return codeUrl;
     }
 }
@@ -10,15 +10,15 @@ import java.util.Map;
  */
 public class OnlinePaymentRequest extends ContainerSupport {
     // 支付ID
-    protected String paymentId;
+    protected final String paymentId;
     // 交易金额 - 分
-    protected long amount;
+    protected final long amount;
     // 商品描述
-    protected String goods;
+    protected final String goods;
     // 交易备注
-    protected String description;
+    protected final String description;
     // 交易时间
-    protected LocalDateTime when;
+    protected final LocalDateTime when;
     public OnlinePaymentRequest(String paymentId, long amount, String goods, String description, LocalDateTime when) {
         this.paymentId = paymentId;
 package com.diligrp.cashier.pipeline.domain;
-import com.diligrp.cashier.shared.domain.ContainerSupport;
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
+import com.diligrp.cashier.pipeline.type.PaymentState;
 import java.time.LocalDateTime;
 /**
  * 在线支付结果领域模型
  */
-public class OnlinePaymentResponse extends ContainerSupport {
-    // 支付ID
-    private String paymentId;
-    // 支付通道订单号
-    private String outTradeNo;
+public class OnlinePaymentResponse extends OnlinePaymentStatus {
+    // 实际支付方式-聚合支付时
+    private final OutPaymentType outPayType;
     // 支付方Id - 比如微信OpenId
-    private String payerId;
+    private final String payerId;
     // 支付时间
-    private LocalDateTime when;
-    // 支付状态
-    private Integer state;
+    private final LocalDateTime when;
     // 交易备注
-    private String message;
+    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, Integer state, String message) {
-        OnlinePaymentResponse response = new OnlinePaymentResponse();
-        response.paymentId = paymentId;
-        response.outTradeNo = outTradeNo;
-        response.payerId = payerId;
-        response.when = when;
-        response.state = state;
-        response.message = message;
-        return response;
+                                           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 String getPaymentId() {
-        return paymentId;
+    public OnlinePaymentResponse(String paymentId, String outTradeNo, OutPaymentType outPayType,
+                                 String payerId, LocalDateTime when, PaymentState state, String message) {
+        super(paymentId, outTradeNo, state);
+        this.outPayType = outPayType;
+        this.payerId = payerId;
+        this.when = when;
+        this.message = message;
     }
-    public String getOutTradeNo() {
-        return outTradeNo;
+    public OutPaymentType getOutPayType() {
+        return outPayType;
     }
     public String getPayerId() {
@@ -49,10 +54,6 @@ public class OnlinePaymentResponse extends ContainerSupport {
         return when;
     }
-    public Integer getState() {
-        return state;
-    }
-
     public String getMessage() {
         return message;
     }
 package com.diligrp.cashier.pipeline.domain;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+
 /**
- * 预支付响应
+ * 在线支付状态，所有支付结果的抽象类
  */
-public class OnlinePrepayResponse {
+public class OnlinePaymentStatus {
     // 支付订单号
     protected String paymentId;
     // 通道订单号
     protected String outTradeNo;
+    // 支付状态
+    protected PaymentState state;
+
+    public OnlinePaymentStatus(String paymentId, String outTradeNo, PaymentState state) {
+        this.paymentId = paymentId;
+        this.outTradeNo = outTradeNo;
+        this.state = state;
+    }
     public String getPaymentId() {
         return paymentId;
@@ -16,4 +26,8 @@ public class OnlinePrepayResponse {
     public String getOutTradeNo() {
         return outTradeNo;
     }
+
+    public PaymentState getState() {
+        return state;
+    }
 }
 package com.diligrp.cashier.pipeline.domain;
-import com.diligrp.cashier.shared.domain.ContainerSupport;
-
 import java.time.LocalDateTime;
 /**
  * 退款结果领域模型
  */
-public class OnlineRefundResponse extends ContainerSupport {
+public class OnlineRefundResponse {
     // 商户退款单号
     private String refundId;
     // 通道退款订单号
+package com.diligrp.cashier.pipeline.domain;
+
+import java.time.LocalDateTime;
+
+/**
+ * 付款码支付
+ */
+public class QrCodePaymentRequest extends OnlinePaymentRequest {
+    private final String qrCode;
+
+    public QrCodePaymentRequest(String paymentId, long amount, String goods, String description, LocalDateTime when, String qrCode) {
+        super(paymentId, amount, goods, description, when);
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode() {
+        return qrCode;
+    }
+}
+package com.diligrp.cashier.pipeline.domain.card;
+
+import com.diligrp.cashier.pipeline.domain.OnlinePaymentRequest;
+
+import java.time.LocalDateTime;
+
+public class CardPaymentRequest extends OnlinePaymentRequest {
+    private final Long accountId;
+    private final String cardNo;
+
+    public CardPaymentRequest(String paymentId, long amount, String goods, String description, LocalDateTime when,
+                              Long accountId, String cardNo) {
+        super(paymentId, amount, goods, description, when);
+        this.accountId = accountId;
+        this.cardNo = cardNo;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+}
+package com.diligrp.cashier.pipeline.domain.card;
+
+import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+
+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) {
+        super(paymentId, outTradeNo, outPayType, payerId, when, state, message);
+    }
+}
-package com.diligrp.cashier.trade.type;
+package com.diligrp.cashier.pipeline.type;
-import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.type.IEnumType;
-import com.diligrp.cashier.trade.exception.TradePaymentException;
 import java.util.Arrays;
 import java.util.Objects;
@@ -10,24 +8,23 @@ import java.util.Optional;
 import java.util.stream.Stream;
 /**
- * 终端来源
+ * 收银台类型
  */
-public enum CashierDesk implements IEnumType {
-
-    NOP("无收银台", 0),
+public enum CashierType implements IEnumType {
     PC("PC收银台", 1),
     MINIPRO("小程序收银台", 2),
-    H5("H5收银台", 2),
+    H5("H5收银台", 3),
+
+    APP("APP收银台", 4);
-    APP("APP收银台", 3);
     private final String name;
     private final int code;
-    CashierDesk(String name, int code) {
+    CashierType(String name, int code) {
         this.name = name;
         this.code = code;
     }
@@ -36,24 +33,26 @@ public enum CashierDesk implements IEnumType {
         return this.code == code;
     }
-    public static Optional<CashierDesk> getType(int code) {
-        Stream<CashierDesk> TYPES = Arrays.stream(CashierDesk.values());
+    public static Optional<CashierType> getType(int code) {
+        Stream<CashierType> TYPES = Arrays.stream(CashierType.values());
         return TYPES.filter(type -> type.getCode() == code).findFirst();
     }
-    public static CashierDesk getByCode(int code) {
-        return getType(code).orElseThrow(() -> new TradePaymentException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "系统暂不支持此收银台类型"));
+    public static CashierType getByCode(int code) {
+        return getType(code).orElseThrow(() -> new IllegalArgumentException("系统暂不支持此收银台类型"));
     }
-    public static void validateIfNonNull(Integer code) {
+    public static CashierType getIfNonNull(Integer code) {
         if (Objects.nonNull(code)) {
-            Stream<CashierDesk> TYPES = Arrays.stream(CashierDesk.values());
-            TYPES.filter(type -> type.getCode() == code).findFirst().orElseThrow(() -> new IllegalArgumentException("Invalid cashier desk"));
+            Stream<CashierType> TYPES = Arrays.stream(CashierType.values());
+            return TYPES.filter(type -> type.getCode() == code).findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Invalid cashier desk"));
         }
+        return null;
     }
     public static String getName(int code) {
-        return getType(code).map(CashierDesk::getName).orElse(null);
+        return getType(code).map(CashierType::getName).orElse(null);
     }
     @Override
 package com.diligrp.cashier.pipeline.type;
-import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
 import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.exception.PlatformServiceException;
 import com.diligrp.cashier.shared.type.IEnumType;
 import java.util.Arrays;
@@ -15,13 +15,11 @@ import java.util.stream.Stream;
  */
 public enum ChannelType implements IEnumType {
-    NOP("未知渠道", 0),
-
     WXPAY("微信渠道", 10),
     ALIPAY("支付宝渠道", 11),
-    DILIPAY("地利渠道", 18), // 地利园区卡支付
+    DILIPAY("地利渠道", 19), // 地利园区卡支付
     ICBC("工商银行", 20),
@@ -61,7 +59,7 @@ public enum ChannelType implements IEnumType {
     }
     public static ChannelType getByCode(int code) {
-        return getType(code).orElseThrow(() -> new PaymentPipelineException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "系统不支持此支付渠道"));
+        return getType(code).orElseThrow(() -> new PlatformServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "系统不支持此支付渠道"));
     }
     public static String getName(int code) {
-package com.diligrp.cashier.trade.type;
+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.diligrp.cashier.trade.exception.TradePaymentException;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.stream.Stream;
 /**
- * 聚合支付时实际使用的支付方式
+ * 聚合支付通道实际使用的支付方式
  */
 public enum OutPaymentType implements IEnumType {
-    NOP("其他方式", 0),
     WXPAY("微信支付", 10),
@@ -22,6 +21,8 @@ public enum OutPaymentType implements IEnumType {
     APP("掌银支付", 13),
+    DILICARD("园区卡支付", 19),
+
     BANKCARD("银行卡支付", 20);
     private final String name;
@@ -42,7 +43,7 @@ public enum OutPaymentType implements IEnumType {
     }
     public static OutPaymentType getByCode(int code) {
-        return getType(code).orElseThrow(() -> new TradePaymentException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "系统暂不支持该支付方式"));
+        return getType(code).orElseThrow(() -> new PaymentPipelineException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "系统暂不支持该支付方式"));
     }
     public static String getName(int code) {
 package com.diligrp.cashier.pipeline.type;
 import com.diligrp.cashier.shared.type.IEnumType;
+import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Arrays;
 import java.util.List;
@@ -45,12 +46,25 @@ 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);
+    }
+
     @Override
     public String getName() {
         return name;
     }
     @Override
+    @JsonValue
     public int getCode() {
         return code;
     }
-package com.diligrp.cashier.trade.type;
+package com.diligrp.cashier.pipeline.type;
 import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.exception.PlatformServiceException;
 import com.diligrp.cashier.shared.type.IEnumType;
-import com.diligrp.cashier.trade.exception.TradePaymentException;
 import java.util.Arrays;
 import java.util.Optional;
@@ -12,11 +12,14 @@ import java.util.stream.Stream;
  * 支付方式
  */
 public enum PaymentType implements IEnumType {
-    NATIVE("扫码支付", 1), // 客户扫商户收款码
-
-    QRCODE("付款码支付", 2), // 商户扫客户付款码
-
-    MINI_PRO("小程序支付", 3); // 目前特指微信小程序支付
+    // 直接支付, 使用PaymentPipeline.sendPaymentRequest
+    DIRECT("直接支付", 0),
+    // 客户扫商户收款码, 使用PaymentPipeline.sendNativePrepayRequest
+    NATIVE("扫码支付", 1),
+    // 商户扫客户付款码, 使用PaymentPipeline.sendQrCodePaymentRequest
+    QRCODE("付款码支付", 2),
+    // 目前特指微信小程序支付, 使用PaymentPipeline.sendMiniProPrepayRequest
+    MINI_PRO("小程序支付", 3);
     private final String name;
     private final int code;
@@ -36,7 +39,7 @@ public enum PaymentType implements IEnumType {
     }
     public static PaymentType getByCode(int code) {
-        return getType(code).orElseThrow(() -> new TradePaymentException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "系统不支持此类支付方式"));
+        return getType(code).orElseThrow(() -> new PlatformServiceException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "系统不支持此类支付方式"));
     }
     public static String getName(int code) {
@@ -15,11 +15,14 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.lang.NonNull;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
 import java.security.PublicKey;
 import java.text.SimpleDateFormat;
@@ -36,7 +39,7 @@ public class SharedConfiguration {
     public WebMvcConfigurer corsConfigurer() {
         return new WebMvcConfigurer() {
             @Override
-            public void addCorsMappings(CorsRegistry registry) {
+            public void addCorsMappings(@NonNull CorsRegistry registry) {
                 registry.addMapping("/**")
                         .allowedOriginPatterns("*")
                         .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
@@ -71,7 +74,7 @@ public class SharedConfiguration {
         // 不能使用lambda表达式，否则导致springboot启动问题
         return new Converter<String, LocalDateTime>() {
             @Override
-            public LocalDateTime convert(String source) {
+            public LocalDateTime convert(@NonNull String source) {
                 try {
                     return StringUtils.hasText(source) ? LocalDateTime.parse(source, DateTimeFormatter.ofPattern(Constants.DATE_TIME_FORMAT)) : null;
                 } catch (Exception ex) {
@@ -86,7 +89,7 @@ public class SharedConfiguration {
         // 不能使用lambda表达式，否则导致springboot启动问题
         return new Converter<String, LocalDate>() {
             @Override
-            public LocalDate convert(String source) {
+            public LocalDate convert(@NonNull String source) {
                 try {
                     return StringUtils.hasText(source) ? LocalDate.parse(source, DateTimeFormatter.ofPattern(Constants.DATE_FORMAT)) : null;
                 } catch (Exception ex) {
@@ -101,7 +104,7 @@ public class SharedConfiguration {
         // 不能使用lambda表达式，否则导致springboot启动问题
         return new Converter<String, LocalTime>() {
             @Override
-            public LocalTime convert(String source) {
+            public LocalTime convert(@NonNull String source) {
                 try {
                     return StringUtils.hasText(source) ? LocalTime.parse(source, DateTimeFormatter.ofPattern(Constants.TIME_FORMAT)) : null;
                 } catch (Exception ex) {
@@ -116,7 +119,7 @@ public class SharedConfiguration {
         // 不能使用lambda表达式，否则导致springboot启动问题
         return new Converter<String, Date>() {
             @Override
-            public Date convert(String source) {
+            public Date convert(@NonNull String source) {
                 try {
                     return StringUtils.hasText(source) ? new SimpleDateFormat(Constants.DATE_TIME_FORMAT).parse(source) : null;
                 } catch (Exception ex) {
@@ -128,9 +131,9 @@ public class SharedConfiguration {
     @Component
     @ConfigurationPropertiesBinding
-    public class PrivateKeyConverter implements Converter<String, PrivateKey> {
+    public static class PrivateKeyConverter implements Converter<String, PrivateKey> {
         @Override
-        public PrivateKey convert(String source) {
+        public PrivateKey convert(@NonNull String source) {
             try {
                 return RsaCipher.getPrivateKey(source);
             } catch (Exception ex) {
@@ -141,9 +144,9 @@ public class SharedConfiguration {
     @Component
     @ConfigurationPropertiesBinding
-    public class PublicKeyConverter implements Converter<String, PublicKey> {
+    public static class PublicKeyConverter implements Converter<String, PublicKey> {
         @Override
-        public PublicKey convert(String source) {
+        public PublicKey convert(@NonNull String source) {
             try {
                 return RsaCipher.getPublicKey(source);
             } catch (Exception ex) {
@@ -151,4 +154,13 @@ public class SharedConfiguration {
             }
         }
     }
+
+    @Component
+    @ConfigurationPropertiesBinding
+    public static class SecretKeyConverter implements Converter<String, SecretKeySpec> {
+        @Override
+        public SecretKeySpec convert(@NonNull String source) {
+            return new SecretKeySpec(source.getBytes(StandardCharsets.UTF_8), "HmacSHA256");
+        }
+    }
 }
 \ No newline at end of file
+package com.diligrp.cashier.shared.codec;
+
+public interface ByteCodec<T> {
+
+    T decode(byte[] payload);
+
+    byte[] encode(T payload);
+}
-package com.diligrp.cashier.shared.codec;
-
-import java.io.IOException;
-
-public interface ByteDecoder<T> {
-    T decode(byte[] payload) throws IOException;
-}
-package com.diligrp.cashier.shared.codec;
-
-import java.io.IOException;
-
-public interface ByteEncoder<T> {
-    byte[] encode(T payload) throws IOException;
-}
+package com.diligrp.cashier.shared.codec;
+
+import java.util.Objects;
+
+@FunctionalInterface
+public interface IConverter<T, R> {
+    R convert(T t);
+
+    default <V> IConverter<T, V> andThen(IConverter<? super R, ? extends V> after) {
+        Objects.requireNonNull(after);
+        return (T t) -> after.convert(convert(t));
+    }
+}
+package com.diligrp.cashier.shared.codec;
+
+public interface JsonCodec<T> {
+
+    T decode(String payload);
+
+    String encode(T payload);
+}
@@ -2,32 +2,17 @@ package com.diligrp.cashier.shared.codec;
 import java.nio.charset.StandardCharsets;
-public final class StringCodec {
-    public static ByteEncoder<String> getEncoder() {
-        return StringEncoder.INSTANCE;
-    }
-
-    public static ByteDecoder<String> getDecoder() {
-        return StringDecoder.INSTANCE;
-    }
+public final class StringCodec implements ByteCodec<String> {
-    static class StringEncoder implements ByteEncoder<String> {
+    public static ByteCodec<String> INSTANCE = new StringCodec();
-        static final ByteEncoder<String> INSTANCE = new StringEncoder();
-
-        @Override
-        public byte[] encode(String payload) {
-            return payload.getBytes(StandardCharsets.UTF_8);
-        }
+    @Override
+    public String decode(byte[] payload) {
+        return new String(payload, StandardCharsets.UTF_8);
     }
-    static class StringDecoder implements ByteDecoder<String> {
-
-        static final ByteDecoder<String> INSTANCE = new StringDecoder();
-
-        @Override
-        public String decode(byte[] payload) {
-            return new String(payload, StandardCharsets.UTF_8);
-        }
+    @Override
+    public byte[] encode(String payload) {
+        return payload.getBytes(StandardCharsets.UTF_8);
     }
 }
+package com.diligrp.cashier.shared.security;
+
+public final class Base62Cipher {
+
+    private static final char[] BASE62_CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
+
+    private static final int BASE = 62;
+
+    public static String encodeLong(long data) {
+        if (data < 0) {
+            throw new IllegalArgumentException("cannot be negative");
+        }
+
+        if (data == 0) {
+            return String.valueOf(BASE62_CHARS[0]);
+        }
+
+        StringBuilder sb = new StringBuilder();
+        while (data > 0) {
+            int remainder = (int) (data % BASE);
+            sb.append(BASE62_CHARS[remainder]);
+            data = data / BASE;
+        }
+
+        // 反转字符串（因为取余是从低位到高位，需要反转恢复顺序）
+        return sb.reverse().toString();
+    }
+
+    public static long decodeLong(String payload) {
+        if (payload == null || payload.isEmpty()) {
+            throw new IllegalArgumentException("Invalid base62 data");
+        }
+
+        long result = 0;
+        for (char c : payload.toCharArray()) {
+            if (result > (Long.MAX_VALUE - getCharIndex(c)) / BASE) {
+                throw new NumberFormatException("Invalid base62 data: overflow long");
+            }
+            result = result * BASE + getCharIndex(c);
+        }
+        return result;
+    }
+
+    private static int getCharIndex(char c) {
+        if (c >= '0' && c <= '9') {
+            return c - '0';
+        } else if (c >= 'a' && c <= 'z') {
+            return 10 + (c - 'a');
+        } else if (c >= 'A' && c <= 'Z') {
+            return 36 + (c - 'A');
+        } else {
+            throw new IllegalArgumentException("invalid base62 data：" + c);
+        }
+    }
+}
+package com.diligrp.cashier.shared.spi;
+
+@FunctionalInterface
+public interface IPaymentEventListener {
+
+    void onEvent(PaymentEvent event);
+}
+package com.diligrp.cashier.shared.spi;
+
+import java.time.LocalDateTime;
+
+public class PaymentEvent {
+    // 支付ID
+    private final String tradeId;
+    // 支付状态
+    private final Integer state;
+    // 业务系统订单号
+    private final String outTradeNo;
+    // 实际支付方式
+    private final Integer outPayType;
+    // 支付人信息
+    private final String payerId;
+    // 发生时间
+    private final LocalDateTime when;
+    // 交易描述
+    private final String message;
+
+    public PaymentEvent(String tradeId, int state, String outTradeNo, Integer outPayType, String payerId, LocalDateTime when, String message) {
+        this.tradeId = tradeId;
+        this.state = state;
+        this.outTradeNo = outTradeNo;
+        this.outPayType = outPayType;
+        this.payerId = payerId;
+        this.when = when;
+        this.message = message;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public Integer getOutPayType() {
+        return outPayType;
+    }
+
+    public String getPayerId() {
+        return payerId;
+    }
+
+    public LocalDateTime getWhen() {
+        return when;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+}
+package com.diligrp.cashier.trade;
+
+public final class Constants {
+
+    // 默认订单超时时间-秒, 十分钟
+    public static final int DEFAULT_ORDER_TIMEOUT_SECONDS = 10 * 60 * 1000;
+
+    // 最小订单超时时间-秒， 一分钟
+    public static final int MIN_ORDER_TIMEOUT_SECONDS = 60 * 1000;
+
+    // 支付订单分布式锁
+    public static final String TRADE_LOCK_REDIS_KEY = "cashier:lock:trade:%s";
+
+    // 支付订单分布式锁超时时长-秒
+    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";
+
+}
 package com.diligrp.cashier.trade;
+import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 @Configuration
 @ComponentScan("com.diligrp.cashier.trade")
+@MapperScan(basePackages =  {"com.diligrp.cashier.trade.dao"}, markerInterface = MybatisMapperSupport.class)
 public class TradeConfiguration {
 }
+package com.diligrp.cashier.trade.dao;
+
+import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
+import com.diligrp.cashier.trade.domain.PaymentStateDTO;
+import com.diligrp.cashier.trade.model.OnlinePayment;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 支付申请数据访问层
+ */
+@Repository("onlinePaymentDao")
+public interface IOnlinePaymentDao extends MybatisMapperSupport {
+
+    void insertOnlinePayment(OnlinePayment payment);
+
+    Optional<OnlinePayment> findByPaymentId(String paymentId);
+
+    int compareAndSetState(PaymentStateDTO paymentDTO);
+
+    List<OnlinePayment> findByTradeId(@Param("tradeId") String tradeId, @Param("state") Integer state);
+}
+package com.diligrp.cashier.trade.dao;
+
+import com.diligrp.cashier.shared.mybatis.MybatisMapperSupport;
+import com.diligrp.cashier.trade.domain.TradeStateDTO;
+import com.diligrp.cashier.trade.model.TradeOrder;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+
+/**
+ * 交易订单数据访问层
+ */
+@Repository("tradeOrderDao")
+public interface ITradeOrderDao extends MybatisMapperSupport {
+    void insertTradeOrder(TradeOrder tradeOrder);
+
+    Optional<TradeOrder> findByTradeId(String tradeId);
+
+    Optional<TradeOrder> findByOutTradeNo(@Param("mchId") Long mchId, @Param("outTradeNo") String outTradeNo);
+
+    int compareAndSetState(TradeStateDTO tradeState);
+}
 \ No newline at end of file
+package com.diligrp.cashier.trade.domain;
+
+import com.diligrp.cashier.pipeline.type.CashierType;
+
+public class CashierOrder {
+    // 业务系统用户标识
+    private String userId;
+    // 收银台类型 - H5收银台等
+    private CashierType type;
+    // 商品描述
+    private String goods;
+    // 申请金额
+    private Long amount;
+    // 超时间隔时间 - 秒
+    private Integer timeout;
+    // 外部流水号
+    private String outTradeNo;
+    // 回调地址
+    private String notifyUrl;
+    // 交易描述
+    private String description;
+    // 附加数据
+    private String attach;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public CashierType getType() {
+        return type;
+    }
+
+    public void setType(CashierType type) {
+        this.type = type;
+    }
+
+    public String getGoods() {
+        return goods;
+    }
+
+    public void setGoods(String goods) {
+        this.goods = goods;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(Integer timeout) {
+        this.timeout = timeout;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public void setAttach(String attach) {
+        this.attach = attach;
+    }
+}
+package com.diligrp.cashier.trade.domain;
+
+import java.util.Map;
+
+public class CashierPayment {
+    // 支付号
+    private String tradeId;
+    // 选择的支付通道
+    private Long pipelineId;
+    // 用户标识
+    private Long userId;
+    // 支付参数
+    private Map<String, Object> params;
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Long getPipelineId() {
+        return pipelineId;
+    }
+
+    public void setPipelineId(Long pipelineId) {
+        this.pipelineId = pipelineId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Map<String, Object> getParams() {
+        return params;
+    }
+
+    public void setParams(Map<String, Object> params) {
+        this.params = params;
+    }
+}
+package com.diligrp.cashier.trade.domain;
+
+import com.diligrp.cashier.shared.util.JsonUtils;
+
+public class Merchant {
+    // 商户号
+    private Long mchId;
+    // 商户名称
+    private String name;
+    // 商户参数
+    private MerchantParams params;
+
+    public static Merchant of(Long mchId, String name, MerchantParams params) {
+        Merchant merchant = new Merchant();
+        merchant.mchId = mchId;
+        merchant.name = name;
+        merchant.params = params;
+        return merchant;
+    }
+
+    public static Merchant decode(String payload) {
+       if (payload != null) {
+           return JsonUtils.fromJsonString(payload, Merchant.class);
+       }
+       return null;
+    }
+
+    public Long getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(Long mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public MerchantParams getParams() {
+        return params;
+    }
+
+    public void setParams(MerchantParams params) {
+        this.params = params;
+    }
+
+    @Override
+    public String toString() {
+        return JsonUtils.toJsonString(this);
+    }
+}
+package com.diligrp.cashier.trade.domain;
+
+import com.diligrp.cashier.shared.util.JsonUtils;
+
+import java.util.Objects;
+
+public class MerchantParams {
+    // 收银台配置
+    private CashierParams cashier;
+    // TODO: 支付结果页面-跳转大润发使用
+
+    public static MerchantParams decode(String params) {
+        return JsonUtils.fromJsonString(params, MerchantParams.class);
+    }
+
+    public CashierParams getCashier() {
+        return cashier;
+    }
+
+    public void setCashier(CashierParams cashier) {
+        this.cashier = cashier;
+    }
+
+    public static class CashierParams {
+        // PC收银台地址
+        private String pcUrl;
+        // 小程序收银台地址
+        private String miniProUrl;
+        // H5收银台地址
+        private String h5Url;
+        // 小程序收银台地址
+        private String appUrl;
+
+        public void override(CashierParams params) {
+            if (Objects.isNull(this.pcUrl)) {
+                this.pcUrl = params.getPcUrl();
+            }
+            if (Objects.isNull(this.miniProUrl)) {
+                this.miniProUrl = params.getMiniProUrl();
+            }
+            if (Objects.isNull(this.h5Url)) {
+                this.h5Url = params.getH5Url();
+            }
+            if (Objects.isNull(this.appUrl)) {
+                this.appUrl = params.getAppUrl();
+            }
+        }
+
+        public String getPcUrl() {
+            return pcUrl;
+        }
+
+        public void setPcUrl(String pcUrl) {
+            this.pcUrl = pcUrl;
+        }
+
+        public String getMiniProUrl() {
+            return miniProUrl;
+        }
+
+        public void setMiniProUrl(String miniProUrl) {
+            this.miniProUrl = miniProUrl;
+        }
+
+        public String getH5Url() {
+            return h5Url;
+        }
+
+        public void setH5Url(String h5Url) {
+            this.h5Url = h5Url;
+        }
+
+        public String getAppUrl() {
+            return appUrl;
+        }
+
+        public void setAppUrl(String appUrl) {
+            this.appUrl = appUrl;
+        }
+    }
+}
+package com.diligrp.cashier.trade.domain;
+
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+
+import java.time.LocalDateTime;
+
+/**
+ * 支付订单状态处理模型
+ */
+public class PaymentStateDTO {
+    // 支付ID
+    private String paymentId;
+    // 通道流水号
+    private String outTradeNo;
+    // 实际支付方式
+    private Integer outPayType;
+    // 支付方ID - 如：微信的openId
+    private String payerId;
+    // 支付时间
+    private LocalDateTime finishTime;
+    // 订单状态
+    private Integer state;
+    // 交易描述
+    private String description;
+    // 数据版本
+    private Integer version;
+    // 修改时间
+    private LocalDateTime modifiedTime;
+
+    public String getPaymentId() {
+        return paymentId;
+    }
+
+    public void setPaymentId(String paymentId) {
+        this.paymentId = paymentId;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    public Integer getOutPayType() {
+        return outPayType;
+    }
+
+    public void setOutPayType(Integer outPayType) {
+        this.outPayType = outPayType;
+    }
+
+    public String getPayerId() {
+        return payerId;
+    }
+
+    public void setPayerId(String payerId) {
+        this.payerId = payerId;
+    }
+
+    public LocalDateTime getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(LocalDateTime finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public LocalDateTime getModifiedTime() {
+        return modifiedTime;
+    }
+
+    public void setModifiedTime(LocalDateTime modifiedTime) {
+        this.modifiedTime = modifiedTime;
+    }
+
+    public static Builder builder() {
+        return new PaymentStateDTO().new Builder();
+    }
+
+    public class Builder {
+        public Builder paymentId(String paymentId) {
+            PaymentStateDTO.this.paymentId = paymentId;
+            return this;
+        }
+
+        public Builder outTradeNo(String outTradeNo) {
+            PaymentStateDTO.this.outTradeNo = outTradeNo;
+            return this;
+        }
+
+        public Builder outPayType(OutPaymentType outPayType) {
+            PaymentStateDTO.this.outPayType = outPayType.getCode();
+            return this;
+        }
+
+        public Builder payerId(String payerId) {
+            PaymentStateDTO.this.payerId = payerId;
+            return this;
+        }
+
+        public Builder finishTime(LocalDateTime finishTime) {
+            PaymentStateDTO.this.finishTime = finishTime;
+            return this;
+        }
+
+        public Builder state(PaymentState state) {
+            PaymentStateDTO.this.state = state.getCode();
+            return this;
+        }
+
+        public Builder description(String description) {
+            PaymentStateDTO.this.description = description;
+            return this;
+        }
+
+        public Builder version(Integer version) {
+            PaymentStateDTO.this.version = version;
+            return this;
+        }
+
+        public Builder modifiedTime(LocalDateTime modifiedTime) {
+            PaymentStateDTO.this.modifiedTime = modifiedTime;
+            return this;
+        }
+
+        public PaymentStateDTO build() {
+            return PaymentStateDTO.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);
+    }
+}
+package com.diligrp.cashier.trade.domain;
+
+import com.diligrp.cashier.trade.type.TradeState;
+
+import java.time.LocalDateTime;
+
+/**
+ * 交易状态数据传输对象
+ */
+public class TradeStateDTO {
+    // 交易ID
+    private String tradeId;
+    // 金额
+    private Long amount;
+    // 状态
+    private Integer state;
+    // 数据版本
+    private Integer version;
+    // 修改时间
+    private LocalDateTime modifiedTime;
+
+    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 Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    public LocalDateTime getModifiedTime() {
+        return modifiedTime;
+    }
+
+    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
+package com.diligrp.cashier.trade.manager;
+
+import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
+import com.diligrp.cashier.shared.service.ThreadPoolService;
+import com.diligrp.cashier.shared.spi.IPaymentEventListener;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import com.diligrp.cashier.shared.util.ObjectUtils;
+import com.diligrp.cashier.trade.domain.TradePaymentResult;
+import jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("paymentResultManager")
+public class PaymentResultManager {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PaymentResultManager.class);
+
+    @Resource
+    private ObjectProvider<IPaymentEventListener> eventListeners;
+
+    /**
+     * 通知业务系统在线支付通道处理结果
+     */
+    public void notifyPaymentResult(String uri, TradePaymentResult 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 payment result", ex);
+                }
+            }
+        });
+
+        if (ObjectUtils.isEmpty(uri)) {
+            return;
+        }
+
+        ThreadPoolService.getIoThreadPoll().submit(() -> {
+            try {
+                String body = JsonUtils.toJsonString(payload);
+                LOG.info("Notifying online trade payment result: {}", body);
+                ServiceEndpointSupport.HttpResult httpResult = new NotifyHttpClient(uri).send(body);
+                if (httpResult.statusCode != 200) {
+                    LOG.error("Failed to notify trade payment result");
+                }
+            } catch (Exception ex) {
+                LOG.error("Failed to notify trade payment result", ex);
+            }
+        });
+    }
+
+    private static class NotifyHttpClient extends ServiceEndpointSupport {
+        private final String baseUrl;
+
+        public NotifyHttpClient(String baseUrl) {
+            this.baseUrl =  baseUrl;
+        }
+
+        public HttpResult send(String body) {
+            return send(baseUrl, body);
+        }
+    }
+}
+package com.diligrp.cashier.trade.model;
+
+import com.diligrp.cashier.pipeline.type.ChannelType;
+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.domain.BaseDO;
+import com.diligrp.cashier.trade.type.TradeType;
+
+import java.time.LocalDateTime;
+
+public class OnlinePayment extends BaseDO {
+    // 外部商户号
+    private String outMchId;
+    // 订单ID
+    private String tradeId;
+    // 交易类型
+    private Integer type;
+    // 支付ID
+    private String paymentId;
+    // 支付通道
+    private Integer channelId;
+    // 支付方式
+    private Integer payType;
+    // 客户ID
+    private Long pipelineId;
+    // 微信商品描述
+    private String goods;
+    // 申请金额-分
+    private Long amount;
+    // 操作对象-比如：prepareId，二维码，或退款时的原单号
+    private String objectId;
+    // 支付方-如微信openId
+    private String payerId;
+    // 支付时间
+    private LocalDateTime finishTime;
+    // 通道流水号
+    private String outTradeNo;
+    // 实际支付方式-聚合支付通道使用
+    private Integer outPayType;
+    // 申请状态
+    private Integer state;
+    // 备注
+    private String description;
+
+    public String getOutMchId() {
+        return outMchId;
+    }
+
+    public void setOutMchId(String outMchId) {
+        this.outMchId = outMchId;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getPaymentId() {
+        return paymentId;
+    }
+
+    public void setPaymentId(String paymentId) {
+        this.paymentId = paymentId;
+    }
+
+    public Integer getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Integer channelId) {
+        this.channelId = channelId;
+    }
+
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
+    public Long getPipelineId() {
+        return pipelineId;
+    }
+
+    public void setPipelineId(Long pipelineId) {
+        this.pipelineId = pipelineId;
+    }
+
+    public String getGoods() {
+        return goods;
+    }
+
+    public void setGoods(String goods) {
+        this.goods = goods;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public String getObjectId() {
+        return objectId;
+    }
+
+    public void setObjectId(String objectId) {
+        this.objectId = objectId;
+    }
+
+    public String getPayerId() {
+        return payerId;
+    }
+
+    public void setPayerId(String payerId) {
+        this.payerId = payerId;
+    }
+
+    public LocalDateTime getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(LocalDateTime finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    public Integer getOutPayType() {
+        return outPayType;
+    }
+
+    public void setOutPayType(Integer outPayType) {
+        this.outPayType = outPayType;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public static Builder builder() {
+        return new OnlinePayment().new Builder();
+    }
+
+    public class Builder {
+        public Builder outMchId(String outMchId) {
+            OnlinePayment.this.outMchId = outMchId;
+            return this;
+        }
+
+        public Builder tradeId(String tradeId) {
+            OnlinePayment.this.tradeId = tradeId;
+            return this;
+        }
+
+        public Builder type(TradeType type) {
+            OnlinePayment.this.type = type.getCode();
+            return this;
+        }
+
+        public Builder paymentId(String paymentId) {
+            OnlinePayment.this.paymentId = paymentId;
+            return this;
+        }
+
+        public Builder channelId(ChannelType channelType) {
+            OnlinePayment.this.channelId = channelType.getCode();
+            return this;
+        }
+
+        public Builder payType(PaymentType payType) {
+            OnlinePayment.this.payType = payType.getCode();
+            return this;
+        }
+
+        public Builder pipelineId(Long pipelineId) {
+            OnlinePayment.this.pipelineId = pipelineId;
+            return this;
+        }
+
+        public Builder goods(String goods) {
+            OnlinePayment.this.goods = goods;
+            return this;
+        }
+
+        public Builder amount(Long amount) {
+            OnlinePayment.this.amount = amount;
+            return this;
+        }
+
+        public Builder objectId(String objectId) {
+            OnlinePayment.this.objectId = objectId;
+            return this;
+        }
+
+        public Builder payerId(String payerId) {
+            OnlinePayment.this.payerId = payerId;
+            return this;
+        }
+
+        public Builder finishTime(LocalDateTime payTime) {
+            OnlinePayment.this.finishTime = payTime;
+            return this;
+        }
+
+        public Builder outTradeNo(String outTradeNo) {
+            OnlinePayment.this.outTradeNo = outTradeNo;
+            return this;
+        }
+
+        public Builder outPayType(OutPaymentType outPayType) {
+            OnlinePayment.this.outPayType = outPayType.getCode();
+            return this;
+        }
+
+        public Builder state(PaymentState state) {
+            OnlinePayment.this.state = state.getCode();
+            return this;
+        }
+
+        public Builder description(String description) {
+            OnlinePayment.this.description = description;
+            return this;
+        }
+
+        public Builder version(Integer version) {
+            OnlinePayment.this.version = version;
+            return this;
+        }
+
+        public Builder createdTime(LocalDateTime createdTime) {
+            OnlinePayment.this.createdTime = createdTime;
+            return this;
+        }
+
+        public Builder modifiedTime(LocalDateTime modifiedTime) {
+            OnlinePayment.this.modifiedTime = modifiedTime;
+            return this;
+        }
+
+        public OnlinePayment build() {
+            return OnlinePayment.this;
+        }
+    }
+}
+package com.diligrp.cashier.trade.model;
+
+import com.diligrp.cashier.shared.domain.BaseDO;
+
+import java.time.LocalDateTime;
+
+/**
+ * 交易订单数据模型
+ */
+public class TradeOrder extends BaseDO {
+    // 商户ID
+    private Long mchId;
+    // 交易ID
+    private String tradeId;
+    // 交易类型
+    private Integer type;
+    // 外部流水号
+    private String outTradeNo;
+    // 金额-分
+    private Long amount;
+    // 初始金额-分
+    private Long maxAmount;
+    // 商品描述
+    private String goods;
+    // 订单超时时间-秒
+    private Integer timeout;
+    // 交易状态
+    private Integer state;
+    // 业务回调地址
+    private String notifyUrl;
+    // 交易备注
+    private String description;
+    // 附加数据
+    private String attach;
+    // 收银台来源
+    private Integer source;
+
+    public Long getMchId() {
+        return mchId;
+    }
+
+    public void setMchId(Long mchId) {
+        this.mchId = mchId;
+    }
+
+    public String getTradeId() {
+        return tradeId;
+    }
+
+    public void setTradeId(String tradeId) {
+        this.tradeId = tradeId;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    public void setOutTradeNo(String outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    public Long getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Long amount) {
+        this.amount = amount;
+    }
+
+    public Long getMaxAmount() {
+        return maxAmount;
+    }
+
+    public void setMaxAmount(Long maxAmount) {
+        this.maxAmount = maxAmount;
+    }
+
+    public String getGoods() {
+        return goods;
+    }
+
+    public void setGoods(String goods) {
+        this.goods = goods;
+    }
+
+    public Integer getTimeout() {
+        return timeout;
+    }
+
+    public void setTimeout(Integer timeout) {
+        this.timeout = timeout;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getNotifyUrl() {
+        return notifyUrl;
+    }
+
+    public void setNotifyUrl(String notifyUrl) {
+        this.notifyUrl = notifyUrl;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getAttach() {
+        return attach;
+    }
+
+    public void setAttach(String attach) {
+        this.attach = attach;
+    }
+
+    public Integer getSource() {
+        return source;
+    }
+
+    public void setSource(Integer source) {
+        this.source = source;
+    }
+
+    public static Builder builder() {
+        return new TradeOrder().new Builder();
+    }
+
+    public class Builder {
+        public Builder mchId(Long mchId) {
+            TradeOrder.this.mchId = mchId;
+            return this;
+        }
+
+        public Builder tradeId(String tradeId) {
+            TradeOrder.this.tradeId = tradeId;
+            return this;
+        }
+
+        public Builder type(Integer type) {
+            TradeOrder.this.type = type;
+            return this;
+        }
+
+        public Builder outTradeNo(String outTradeNo) {
+            TradeOrder.this.outTradeNo = outTradeNo;
+            return this;
+        }
+
+        public Builder amount(Long amount) {
+            TradeOrder.this.amount = amount;
+            return this;
+        }
+
+        public Builder maxAmount(Long maxAmount) {
+            TradeOrder.this.maxAmount = maxAmount;
+            return this;
+        }
+
+        public Builder goods(String goods) {
+            TradeOrder.this.goods = goods;
+            return this;
+        }
+
+        public Builder timeout(Integer timeout) {
+            TradeOrder.this.timeout = timeout;
+            return this;
+        }
+
+        public Builder state(Integer state) {
+            TradeOrder.this.state = state;
+            return this;
+        }
+
+        public Builder notifyUrl(String notifyUrl) {
+            TradeOrder.this.notifyUrl = notifyUrl;
+            return this;
+        }
+
+        public Builder description(String description) {
+            TradeOrder.this.description = description;
+            return this;
+        }
+
+        public Builder attach(String attach) {
+            TradeOrder.this.attach = attach;
+            return this;
+        }
+
+        public Builder source(Integer source) {
+            TradeOrder.this.source = source;
+            return this;
+        }
+
+        public Builder version(Integer version) {
+            TradeOrder.this.version = version;
+            return this;
+        }
+
+        public Builder createdTime(LocalDateTime createdTime) {
+            TradeOrder.this.createdTime = createdTime;
+            return this;
+        }
+
+        public Builder modifiedTime(LocalDateTime modifiedTime) {
+            TradeOrder.this.modifiedTime = modifiedTime;
+            return this;
+        }
+
+        public TradeOrder build() {
+            return TradeOrder.this;
+        }
+    }
+}
+package com.diligrp.cashier.trade.service;
+
+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;
+
+public interface ICashierPaymentService {
+    /**
+     * 提交收银台订单
+     *
+     * @param  merchant - 接入商户
+     * @param cashierOrder - 订单申请
+     * @return 支付ID
+     */
+    String doSubmit(Merchant merchant, CashierOrder cashierOrder);
+
+    /**
+     * 收银台支付
+     *
+     * @param cashierPayment - 支付信息
+     * @return 支付状态
+     */
+    OnlinePaymentStatus doPayment(CashierPayment cashierPayment);
+}
+package com.diligrp.cashier.trade.service;
+
+public interface IPaymentAssistantService {
+}
+package com.diligrp.cashier.trade.service;
+
+import com.diligrp.cashier.trade.domain.PaymentStateDTO;
+import com.diligrp.cashier.trade.domain.TradeStateDTO;
+import com.diligrp.cashier.trade.model.OnlinePayment;
+import com.diligrp.cashier.trade.model.TradeOrder;
+
+public interface ITradeAssistantService {
+
+    /**
+     * 查询交易订单
+     */
+    TradeOrder findByTradeId(String tradeId);
+
+    /**
+     * 交易订单状态处理
+     */
+    void proceedTradeOrder(TradeStateDTO tradeStateDTO);
+
+    /**
+     * 关闭交易订单下状态为支付中的支付订单
+     */
+    boolean resetTradeOrder(TradeOrder tradeOrder);
+
+    /**
+     * 查询支付订单
+     */
+    OnlinePayment findByPaymentId(String paymentId);
+
+    /**
+     * 支付订单状态处理
+     */
+    void proceedOnlinePayment(PaymentStateDTO paymentDTO);
+
+}
+package com.diligrp.cashier.trade.service.impl;
+
+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.domain.card.CardPaymentRequest;
+import com.diligrp.cashier.pipeline.domain.card.CardPaymentResponse;
+import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
+import com.diligrp.cashier.pipeline.type.CashierType;
+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.trade.Constants;
+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.PaymentResultManager;
+import com.diligrp.cashier.trade.model.OnlinePayment;
+import com.diligrp.cashier.trade.model.TradeOrder;
+import com.diligrp.cashier.trade.service.ICashierPaymentService;
+import com.diligrp.cashier.trade.service.ITradeAssistantService;
+import com.diligrp.cashier.trade.type.SnowflakeKey;
+import com.diligrp.cashier.trade.type.TradeState;
+import com.diligrp.cashier.trade.type.TradeType;
+import com.diligrp.cashier.trade.util.CardPaymentConverter;
+import com.diligrp.cashier.trade.util.MiniProPaymentConverter;
+import jakarta.annotation.Resource;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+@Service("cashierPaymentService")
+public class CashierPaymentServiceImpl implements ICashierPaymentService {
+
+    @Resource
+    private ITradeOrderDao tradeOrderDao;
+
+    @Resource
+    private IOnlinePaymentDao onlinePaymentDao;
+
+    @Resource
+    private ITradeAssistantService tradeAssistantService;
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    @Resource
+    private PaymentResultManager paymentResultManager;
+
+    @Resource
+    private SnowflakeKeyManager snowflakeKeyManager;
+
+    @Resource
+    private RedissonClient redissonClient;
+
+    /**
+     * 提交收银台订单
+     *
+     * @param merchant - 接入商户
+     * @param cashierOrder - 订单申请
+     * @return 支付ID
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String doSubmit(Merchant merchant, CashierOrder cashierOrder) {
+        LocalDateTime now = LocalDateTime.now();
+        String tradeId = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.TRADE_ID).nextId();
+        int timeout = Objects.isNull(cashierOrder.getTimeout()) ? Constants.DEFAULT_ORDER_TIMEOUT_SECONDS : cashierOrder.getTimeout();
+        timeout = Math.max(timeout, Constants.MIN_ORDER_TIMEOUT_SECONDS);
+        TradeOrder tradeOrder = TradeOrder.builder().mchId(merchant.getMchId()).tradeId(tradeId)
+            .type(cashierOrder.getType().getCode()).outTradeNo(cashierOrder.getOutTradeNo()).amount(cashierOrder.getAmount())
+            .maxAmount(cashierOrder.getAmount()).goods(cashierOrder.getGoods()).timeout(timeout).state(TradeState.PENDING.getCode())
+            .notifyUrl(cashierOrder.getNotifyUrl()).description(cashierOrder.getDescription()).attach(cashierOrder.getAttach())
+            .source(0).version(0).createdTime(now).modifiedTime(now).build();
+        tradeOrderDao.insertTradeOrder(tradeOrder);
+
+        // TODO: userId是否需要存储
+        // TODO: 如果不打开收银台支付，定时关闭订单
+        return tradeId;
+    }
+
+    /**
+     * 收银台支付
+     *
+     * @param cashierPayment - 支付信息
+     * @return 支付状态
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public OnlinePaymentStatus doPayment(CashierPayment cashierPayment) {
+        // 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, "该交易订单已经完成，不能进行支付");
+                }
+                // 关闭支付中的支付订单, 避免一个交易订单存在多笔支付订单, 造成重复支付
+                if (!tradeAssistantService.resetTradeOrder(tradeOrder)) {
+                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "存在支付中的支付申请");
+                }
+
+                LocalDateTime now = LocalDateTime.now();
+                // 获取支付通道
+                PaymentPipeline<?> pipeline = paymentPipelineManager.findPipelineById(cashierPayment.getPipelineId(), PaymentPipeline.class);
+                String paymentId = snowflakeKeyManager.getKeyGenerator(SnowflakeKey.PAYMENT_ID).nextId();
+                if (pipeline instanceof DiliCardPipeline cardPipeline) {
+                    // 园区卡支付通道: 所有的收银台类型使用的是同一种园区卡支付流程
+                    // 检查园区卡支付参数
+                    CardPaymentRequest request = new CardPaymentConverter(tradeOrder, paymentId, now).convert(cashierPayment);
+                    // 修改支付状态为支付中，防止重复支付
+                    CardPaymentResponse response = cardPipeline.sendPaymentRequest(request);
+                    if (PaymentState.isFinished(response.getState().getCode())) {
+                        // 园区卡支付通道outMchId为市场ID
+                        String outMchId = cardPipeline.params().getOutMchId();
+                        OnlinePayment payment = OnlinePayment.builder().outMchId(outMchId).tradeId(tradeOrder.getTradeId())
+                            .type(TradeType.TRADE).paymentId(paymentId).channelId(pipeline.supportedChannel())
+                            .payType(PaymentType.DIRECT).pipelineId(pipeline.pipelineId()).goods(tradeOrder.getGoods())
+                            .amount(tradeOrder.getAmount()).payerId(response.getPayerId())
+                            .finishTime(response.getWhen()).outTradeNo(response.getOutTradeNo())
+                            .outPayType(OutPaymentType.DILICARD).state(response.getState())
+                            .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, "不支持的收银台类型");
+                    }
+                } else {
+                    // 目前只有两类支付通道: CardPipeline和OnlinePipeline, 程序逻辑不应该到达此代码块
+                    throw new TradePaymentException(ErrorCode.OPERATION_NOT_ALLOWED, "不支持的支付通道类型");
+                }
+            } else {
+                throw new TradePaymentException(ErrorCode.SYSTEM_BUSY_ERROR, ErrorCode.MESSAGE_SYSTEM_BUSY);
+            }
+        } catch (InterruptedException ex) {
+            // 重新设置中断标识
+            Thread.currentThread().interrupt();
+            throw new TradePaymentException(ErrorCode.SYSTEM_BUSY_ERROR, ErrorCode.MESSAGE_SYSTEM_BUSY);
+        } finally {
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+}
+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.OnlinePrepayOrder;
+import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.trade.dao.IOnlinePaymentDao;
+import com.diligrp.cashier.trade.dao.ITradeOrderDao;
+import com.diligrp.cashier.trade.domain.PaymentStateDTO;
+import com.diligrp.cashier.trade.domain.TradeStateDTO;
+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 jakarta.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+
+@Service("tradeAssistantService")
+public class TradeAssistantServiceImpl implements ITradeAssistantService {
+
+    private static final Logger LOG = LoggerFactory.getLogger(TradeAssistantServiceImpl.class);
+
+    @Resource
+    private ITradeOrderDao tradeOrderDao;
+
+    @Resource
+    private IOnlinePaymentDao onlinePaymentDao;
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    @Override
+    public TradeOrder findByTradeId(String tradeId) {
+        Optional<TradeOrder> tradeOpt = tradeOrderDao.findByTradeId(tradeId);
+        return tradeOpt.orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "支付订单不存在"));
+    }
+
+    @Override
+    public void proceedTradeOrder(TradeStateDTO tradeStateDTO) {
+        if (tradeOrderDao.compareAndSetState(tradeStateDTO) == 0) {
+            throw new TradePaymentException(ErrorCode.SYSTEM_BUSY_ERROR, ErrorCode.MESSAGE_SYSTEM_BUSY);
+        }
+    }
+
+    /**
+     * 关闭交易订单下状态为支付中的支付订单, 园区卡支付不存在支付中的订单
+     *
+     * 独立数据库事务, 避免远程支付通道关单后, 支付订单状态仍然为支付中
+     * 任何一笔关闭订单失败都应该返回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);
+                if (pipeline instanceof OnlinePipeline<?> onlinePipeline) {
+                    LocalDateTime now = LocalDateTime.now();
+                    PaymentStateDTO paymentStateDTO = PaymentStateDTO.builder().paymentId(onlinePayment.getPaymentId())
+                        .finishTime(now).state(PaymentState.FAILED).description("主动关闭支付中的订单")
+                        .version(onlinePayment.getVersion()).modifiedTime(now).build();
+                    proceedOnlinePayment(paymentStateDTO);
+                    OnlinePrepayOrder prepayOrder = new OnlinePrepayOrder(onlinePayment.getPaymentId(), onlinePayment.getOutTradeNo());
+                    // 微信服务商模式下, outMchId为签约子商户; 园区卡支付时, outMchId为市场ID
+                    prepayOrder.attach(Constants.PARAM_MCH_ID, onlinePayment.getOutMchId());
+                    onlinePipeline.closePrepayOrder(prepayOrder);
+                }
+                // 园区卡支付不存在支付中的订单
+            } catch (Exception ex) {
+                result = false;
+                LOG.error("关闭支付订单失败: {}", onlinePayment.getPaymentId(), ex);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public OnlinePayment findByPaymentId(String paymentId) {
+        Optional<OnlinePayment> paymentOpt = onlinePaymentDao.findByPaymentId(paymentId);
+        return paymentOpt.orElseThrow(() -> new TradePaymentException(ErrorCode.OBJECT_NOT_FOUND, "支付订单不存在"));
+    }
+
+    @Override
+    public void proceedOnlinePayment(PaymentStateDTO paymentDTO) {
+        if (onlinePaymentDao.compareAndSetState(paymentDTO) == 0) {
+            throw new TradePaymentException(ErrorCode.SYSTEM_BUSY_ERROR, ErrorCode.MESSAGE_SYSTEM_BUSY);
+        }
+    }
+}
+package com.diligrp.cashier.trade.type;
+
+import com.diligrp.cashier.shared.type.IEnumType;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * 订单来源
+ */
+public enum SourceType implements IEnumType {
+
+    PC("PC端", 1),
+
+    MINIPRO("小程序端", 2),
+
+    APP("APP端", 3),
+
+    ATM("自助机", 4);
+
+    private final String name;
+    private final int code;
+
+    SourceType(String name, int code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public boolean equalTo(int code) {
+        return this.code == code;
+    }
+
+    public static Optional<SourceType> getType(int code) {
+        Stream<SourceType> TYPES = Arrays.stream(SourceType.values());
+        return TYPES.filter(type -> type.getCode() == code).findFirst();
+    }
+
+    public static String getName(int code) {
+        return getType(code).map(SourceType::getName).orElse(null);
+    }
+
+    public static List<SourceType> getTypes() {
+        return Arrays.asList(SourceType.values());
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public int getCode() {
+        return code;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
 package com.diligrp.cashier.trade.type;
+import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.type.IEnumType;
 import java.util.Arrays;
@@ -14,6 +15,8 @@ public enum TradeState implements IEnumType {
     PENDING("待处理", 1),
+    PROCESSING("处理中", 2),
+
     SUCCESS("交易成功", 4),
     REFUND("交易退款", 5),
@@ -47,6 +50,19 @@ 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);
+    }
+
     /**
      * 交易订单是否允许退款; 允许多次交易退款
      *
+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.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;
+
+public class CardPaymentConverter implements IConverter<CashierPayment, CardPaymentRequest> {
+
+    private static final String PARAM_ACCOUNT_ID = "accountId";
+
+    private static final String PARAM_CARD_NO = "cardNo";
+
+    private final TradeOrder tradeOrder;
+
+    private final String paymentId;
+
+    private final LocalDateTime when;
+
+    public CardPaymentConverter(TradeOrder tradeOrder, String paymentId, LocalDateTime when) {
+        this.tradeOrder = tradeOrder;
+        this.paymentId = paymentId;
+        this.when = when;
+    }
+
+    @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);
+        String cardNo = (String) params.get(PARAM_CARD_NO);
+        Assert.notNull(accountId, "params.accountId missed");
+        Assert.notNull(cardNo, "params.cardNo missed");
+
+        return new CardPaymentRequest(paymentId, tradeOrder.getMaxAmount(),
+            tradeOrder.getGoods(), tradeOrder.getDescription(), when, accountId, cardNo);
+    }
+}
+package com.diligrp.cashier.trade.util;
+
+import com.diligrp.cashier.pipeline.Constants;
+import com.diligrp.cashier.pipeline.domain.MiniProPrepayRequest;
+import com.diligrp.cashier.shared.codec.IConverter;
+import com.diligrp.cashier.trade.domain.CashierPayment;
+import com.diligrp.cashier.trade.model.TradeOrder;
+import org.springframework.util.Assert;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+
+public class MiniProPaymentConverter implements IConverter<CashierPayment, MiniProPrepayRequest> {
+
+    private final TradeOrder tradeOrder;
+
+    private final String paymentId;
+
+    private final LocalDateTime when;
+
+    public MiniProPaymentConverter(TradeOrder tradeOrder, String paymentId, LocalDateTime when) {
+        this.tradeOrder = tradeOrder;
+        this.paymentId = paymentId;
+        this.when = when;
+    }
+
+    @Override
+    public MiniProPrepayRequest convert(CashierPayment payment) {
+        Map<String, Object> params = payment.getParams();
+        Assert.notNull(params, "params missed");
+        String openId = (String) params.get(Constants.PARAM_OPEN_ID);
+        Assert.notNull(openId, "params.openId missed");
+
+        MiniProPrepayRequest prepayRequest = new MiniProPrepayRequest(paymentId, tradeOrder.getMaxAmount(),
+            tradeOrder.getGoods(), tradeOrder.getDescription(), when, openId);
+        prepayRequest.putParams(params);
+        return prepayRequest;
+    }
+}
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.diligrp.cashier.trade.dao.IOnlinePaymentDao">
+    <resultMap id="OnlinePaymentMap" type="com.diligrp.cashier.trade.model.OnlinePayment">
+        <id column="id" property="id"/>
+        <result column="out_mch_id" property="outMchId"/>
+        <result column="trade_id" property="tradeId"/>
+        <result column="type" property="type"/>
+        <result column="payment_id" property="paymentId"/>
+        <result column="channel_id" property="channelId"/>
+        <result column="pay_type" property="payType"/>
+        <result column="pipeline_id" property="pipelineId"/>
+        <result column="goods" property="goods"/>
+        <result column="amount" property="amount"/>
+        <result column="object_id" property="objectId"/>
+        <result column="payer_id" property="payerId"/>
+        <result column="finish_time" property="finishTime"/>
+        <result column="out_trade_no" property="outTradeNo"/>
+        <result column="out_pay_type" property="outPayType"/>
+        <result column="state" property="state"/>
+        <result column="description" property="description"/>
+        <result column="version" property="version"/>
+        <result column="created_time" property="createdTime"/>
+        <result column="modified_time" property="modifiedTime"/>
+    </resultMap>
+
+    <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)
+        VALUES
+          (#{outMchId}, #{tradeId}, #{type}, #{paymentId}, #{channelId}, #{payType}, #{pipelineId},
+           #{goods}, #{amount}, #{objectId}, #{payerId}, #{finishTime}, #{outTradeNo}, #{outPayType}
+           #{state}, #{description}, #{version}, #{createdTime}, #{modifiedTime})
+    </insert>
+
+    <select id="findByPaymentId" parameterType="string" resultMap="OnlinePaymentMap">
+        SELECT * FROM upay_online_payment WHERE payment_id = #{paymentId}
+    </select>
+
+    <update id="compareAndSetState" parameterType="com.diligrp.cashier.trade.domain.PaymentStateDTO">
+        UPDATE upay_online_payment SET version = version + 1
+        <if test="outTradeNo != null">
+            , out_trade_no = #{outTradeNo}
+        </if>
+        <if test="outPayType != null">
+            , out_pay_type = #{outPayType}
+        </if>
+        <if test="payerId != null">
+            , payer_id = #{payerId}
+        </if>
+        <if test="finishTime != null">
+            , finish_time = #{finishTime}
+        </if>
+        <if test="state != null">
+            , state = #{state}
+        </if>
+        <if test="description != null">
+            , description = #{description}
+        </if>
+        <if test="modifiedTime != null">
+            , modified_time = #{modifiedTime}
+        </if>
+        WHERE
+        payment_id = #{paymentId} AND version = #{version}
+    </update>
+
+    <select id="findByTradeId" resultMap="OnlinePaymentMap">
+        SELECT * FROM upay_online_payment WHERE trade_id = #{tradeId}
+        <if test="state != null">
+            AND state = #{state}
+        </if>
+        ORDER BY id
+    </select>
+</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.diligrp.cashier.trade.dao.ITradeOrderDao">
+    <resultMap id="TradeOrderMap" type="com.diligrp.cashier.trade.model.TradeOrder">
+        <id column="id" property="id"/>
+        <result column="mch_id" property="mchId"/>
+        <result column="trade_id" property="tradeId"/>
+        <result column="type" property="type"/>
+        <result column="out_trade_no" property="outTradeNo"/>
+        <result column="amount" property="amount"/>
+        <result column="max_amount" property="maxAmount"/>
+        <result column="goods" property="goods"/>
+        <result column="timeout" property="timeout"/>
+        <result column="state" property="state"/>
+        <result column="notify_url" property="notifyUrl"/>
+        <result column="description" property="description"/>
+        <result column="attach" property="attach"/>
+        <result column="source" property="source"/>
+        <result column="version" property="version"/>
+        <result column="created_time" property="createdTime"/>
+        <result column="modified_time" property="modifiedTime"/>
+    </resultMap>
+
+    <insert id="insertTradeOrder" parameterType="com.diligrp.cashier.trade.model.TradeOrder">
+        INSERT INTO upay_trade_order(mch_id, trade_id, type, out_trade_no, amount, max_amount, goods, timeout,
+                                     state, notify_url, description, attach, source, version, created_time, modified_time)
+        VALUES (#{mchId}, #{tradeId}, #{type}, #{outTradeNo}, #{amount}, #{maxAmount}, #{goods}, #{timeout},
+                #{state}, #{notifyUrl}, #{description}, #{attach}, #{source}, #{version}, #{createdTime}, #{modifiedTime})
+    </insert>
+
+    <select id="findByTradeId" resultMap="TradeOrderMap">
+        SELECT * FROM upay_trade_order WHERE trade_id = #{tradeId}
+    </select>
+
+    <select id="findByOutTradeNo" resultMap="TradeOrderMap">
+        SELECT * FROM upay_trade_order WHERE mch_id = #{mchId} AND out_trade_no = #{outTradeNo}
+    </select>
+
+    <update id="compareAndSetState">
+        UPDATE upay_trade_order SET version = version + 1
+        <if test="amount != null">
+            , amount = #{amount}
+        </if>
+        <if test="state != null">
+            , state = #{state}
+        </if>
+        <if test="modifiedTime != null">
+            , modified_time = #{modifiedTime}
+        </if>
+        WHERE
+          trade_id = #{tradeId} AND version = #{version}
+    </update>
+</mapper>
@@ -7,7 +7,6 @@ CREATE TABLE `upay_merchant` (
     `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `mch_id` BIGINT NOT NULL COMMENT '商户ID',
     `name` VARCHAR(60) NOT NULL COMMENT '商户名称',
-    `access_token` VARCHAR(40) NOT NULL COMMENT '访问令牌',
     `param` JSON COMMENT '参数配置',
     `address` VARCHAR(128) COMMENT '商户地址',
     `linkman` VARCHAR(40) COMMENT '联系人',
@@ -27,17 +26,17 @@ 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 '交易类型', -- 购买会员
---     `channel_id` 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) COMMENT '商品描述',
-    `order_timeout` INTEGER UNSIGNED 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 '业务回调链接',
     `description` VARCHAR(128) COMMENT '交易备注',
     `attach` VARCHAR(255) COMMENT '附加数据',
-    `cashier_desk` TINYINT UNSIGNED NOT NULL COMMENT '收银台类型',
+    `source` TINYINT UNSIGNED  COMMENT '订单来源',
     `version` INTEGER UNSIGNED NOT NULL COMMENT '数据版本号',
     `created_time` DATETIME COMMENT '创建时间',
     `modified_time` DATETIME COMMENT '修改时间',
@@ -68,7 +67,6 @@ 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_uri` VARCHAR(128) COMMENT '业务回调链接',
     `description` VARCHAR(256) COMMENT '交易备注',
     `version` INTEGER UNSIGNED NOT NULL COMMENT '数据版本号',
     `created_time` DATETIME COMMENT '创建时间',