rcb payment pipeline supported

huanggang
1 parent b893160f
Showing 20 changed files with 810 additions and 34 deletions
cashier-boss/src/main/java/com/diligrp/cashier/boss/Constants.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/controller/RcbPaymentController.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/domain/CashierOrderVO.java
cashier-boss/src/main/java/com/diligrp/cashier/boss/service/impl/CashierDeskServiceImpl.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/Constants.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/CardPaymentHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/RcbOnlineHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/WechatDirectHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/client/WechatPartnerHttpClient.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/DiliCardPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/PaymentPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/RcbOnlinePipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/WechatPartnerPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/core/WechatPipeline.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/service/impl/PaymentPipelineManagerImpl.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/service/impl/WechatPaymentServiceImpl.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/util/RcbSignatureUtils.java
cashier-pipeline/src/main/java/com/diligrp/cashier/pipeline/util/RcbStateUtils.java
cashier-shared/src/main/java/com/diligrp/cashier/shared/util/DateUtils.java
scripts/cashier-data.sql
@@ -13,8 +13,8 @@ public final class Constants {
     public static final String TOKEN_SIGN_ALGORITHM = "HmacSHA256";
     // TOKEN的签名长度
     public static final int TOKEN_SIGN_LENGTH = 8;
-    // TOKEN过期时长，单位秒 - 两分钟
-    public static final long TOKEN_TIMEOUT_SECONDS = 120;
+    // TOKEN过期时长，单位秒 - 5分钟
+    public static final long TOKEN_TIMEOUT_SECONDS = 5 * 60;
     public final static String CONTENT_TYPE = "application/json;charset=UTF-8";
+package com.diligrp.cashier.boss.controller;
+
+import com.diligrp.cashier.boss.exception.BossServiceException;
+import com.diligrp.cashier.pipeline.core.RcbOnlinePipeline;
+import com.diligrp.cashier.pipeline.domain.OnlinePaymentResponse;
+import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+import com.diligrp.cashier.pipeline.util.RcbSignatureUtils;
+import com.diligrp.cashier.pipeline.util.RcbStateUtils;
+import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.util.JsonUtils;
+import com.diligrp.cashier.shared.util.ObjectUtils;
+import com.diligrp.cashier.trade.model.OnlinePayment;
+import com.diligrp.cashier.trade.service.ICashierPaymentService;
+import com.diligrp.cashier.trade.service.ITradeAssistantService;
+import com.fasterxml.jackson.core.type.TypeReference;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Map;
+
+@RestController
+@RequestMapping(value = "/rcb")
+public class RcbPaymentController {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RcbPaymentController.class);
+
+    @Resource
+    private ITradeAssistantService tradeAssistantService;
+
+    @Resource
+    private ICashierPaymentService cashierPaymentService;
+
+    @Resource
+    private IPaymentPipelineManager paymentPipelineManager;
+
+    /**
+     * 支付结果通知
+     */
+    @RequestMapping(value = "/payment/{paymentId}/notify.do")
+    public ResponseEntity<?> paymentNotify(HttpServletRequest request, @PathVariable("paymentId") String paymentId) {
+        String payload = request.getParameter("order");
+        LOG.info("Receiving rcb payment pipeline result: {}\n{}", paymentId, payload);
+
+        try {
+            LocalDateTime when = LocalDateTime.now();
+            Map<String, String> params = JsonUtils.fromJsonString(payload, new TypeReference<>(){});
+            String sign = params.remove("sign");
+            String source = RcbSignatureUtils.map2String(params);
+
+            OnlinePayment payment = tradeAssistantService.findByPaymentId(paymentId);
+            RcbOnlinePipeline pipeline = paymentPipelineManager.findPipelineById(payment.getPipelineId(), RcbOnlinePipeline.class);
+            RcbOnlinePipeline.RcbParams config = pipeline.params();
+            if (!RcbSignatureUtils.verify(source, config.getKey(), sign)) {
+                LOG.error("Rcb pipeline data sign verify failed");
+                throw new BossServiceException(ErrorCode.UNAUTHORIZED_ACCESS_ERROR, "Data sign verify failed");
+            }
+
+//            String paymentId = params.get("outTradeNo");
+            PaymentState paymentState = RcbStateUtils.paymentState(params.get("orderStatus"));
+            String outTradeNo = params.get("cposOrderId");
+            String paidTime = params.get("paidTime");
+            if (ObjectUtils.isNotEmpty(paidTime)) {
+                long timestamp = Long.parseLong(paidTime); // ⽀付完成时间戳
+                Instant instant = Instant.ofEpochMilli(timestamp);
+                when = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+            }
+            OutPaymentType outPayType = RcbStateUtils.outPayType(params.get("tradeChannel"));
+
+            String payerId = params.get("payUserInfo");
+            String errorDesc = params.get("errorDesc");
+            // String outOrderId = params.get("chnOrderId"); // 第三方支付通道的订单号
+
+            OnlinePaymentResponse paymentResponse = new OnlinePaymentResponse(paymentId, outTradeNo, outPayType,
+                payerId, when, paymentState, errorDesc);
+            cashierPaymentService.notifyPaymentResponse(paymentResponse);
+            return ResponseEntity.ok("SUCCESS");
+        } catch (Exception ex) {
+            LOG.error("Process rcb payment result exception", ex);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("FAILED");
+        }
+    }
+}
@@ -11,14 +11,14 @@ public class CashierOrderVO {
     private final String userId;
     // 商品描述
     private final String goods;
-    // 付款金额-元
-    private final String amount;
+    // 付款金额-分
+    private final Long amount;
     // 页面回调地址
     private final String redirectUrl;
     // 支付通道
     private final List<PaymentPipeline> pipelines;
-    public CashierOrderVO(String tradeId, String userId, String goods, String amount,
+    public CashierOrderVO(String tradeId, String userId, String goods, Long amount,
                           String redirectUrl, List<PaymentPipeline> pipelines) {
         this.tradeId = tradeId;
         this.userId = userId;
@@ -40,7 +40,7 @@ public class CashierOrderVO {
         return goods;
     }
-    public String getAmount() {
+    public Long getAmount() {
         return amount;
     }
@@ -2,8 +2,8 @@ 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.CashierOrderVO;
 import com.diligrp.cashier.boss.domain.CashierOrderToken;
+import com.diligrp.cashier.boss.domain.CashierOrderVO;
 import com.diligrp.cashier.boss.domain.CashierPaymentUrl;
 import com.diligrp.cashier.boss.exception.BossServiceException;
 import com.diligrp.cashier.boss.service.ICashierDeskService;
@@ -12,7 +12,6 @@ import com.diligrp.cashier.pipeline.domain.OnlinePaymentStatus;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
 import com.diligrp.cashier.pipeline.type.PaymentState;
 import com.diligrp.cashier.shared.ErrorCode;
-import com.diligrp.cashier.shared.util.CurrencyUtils;
 import com.diligrp.cashier.shared.util.ObjectUtils;
 import com.diligrp.cashier.trade.domain.*;
 import com.diligrp.cashier.trade.model.TradeOrder;
@@ -87,8 +86,7 @@ public class CashierDeskServiceImpl implements ICashierDeskService {
         List<PaymentPipeline> pipelines = paymentPipelineManager.listPipelines(orderToken.getMchId(), PaymentPipeline.class);
         List<CashierOrderVO.PaymentPipeline> pipelineList = pipelines.stream().map(pipeline ->
             new CashierOrderVO.PaymentPipeline(pipeline.pipelineId(), pipeline.supportedChannel())).toList();
-        String amount = CurrencyUtils.toNoSymbolCurrency(trade.getMaxAmount());
-        return new CashierOrderVO(orderToken.getTradeId(), orderToken.getUserId(), trade.getGoods(), amount,
+        return new CashierOrderVO(orderToken.getTradeId(), orderToken.getUserId(), trade.getGoods(), trade.getMaxAmount(),
             orderToken.getRedirectUrl(), pipelineList);
     }
@@ -12,6 +12,8 @@ public final class Constants {
     public static final String WECHAT_PAYMENT_NOTIFY_URI = "%s/wechat/payment/%s/notify.do";
     // 微信退款结果通知URI: 参数1-baseUri 参数2-refundId
     public static final String WECHAT_REFUND_NOTIFY_URI = "%s/wechat/refund/%s/notify.do";
+    // 农商行聚合支付结果通知URI
+    public static final String RCB_PAYMENT_NOTIFY_URI = "%s/rcb/payment/%s/notify.do";
     public static final long ONE_MINUTE = 60 * 1000;
@@ -73,12 +73,12 @@ public class CardPaymentHttpClient extends ServiceEndpointSupport {
             Map<String, Object> response = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
             if ("200".equals(response.get("code"))) {
                 Map<String, Object> data = (Map<String, Object>) response.get("data");
-                String outTradeNo = (String) data.get("outTradeNo");
+                String outTradeNo = (String) data.get("tradeId");
                 Map<String, Object> payerId = new LinkedHashMap<>();
                 payerId.put("customerId", convertLong(data.get("customerId")));
                 payerId.put("accountId", convertLong(data.get("accountId")));
                 payerId.put("cardNo", data.get("cardNo"));
-                payerId.put("name", data.get("name"));
+                payerId.put("name", data.get("customerName"));
                 return new CardPaymentResponse(request.getPaymentId(), outTradeNo, OutPaymentType.DILICARD,
                         JsonUtils.toJsonString(payerId), now, PaymentState.SUCCESS, "园区卡支付成功");
             } else {
+ package com.diligrp.cashier.pipeline.client;
+
+ import com.diligrp.cashier.pipeline.domain.*;
+ import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
+ import com.diligrp.cashier.pipeline.type.OutPaymentType;
+ import com.diligrp.cashier.pipeline.type.PaymentState;
+ import com.diligrp.cashier.pipeline.util.RcbSignatureUtils;
+ import com.diligrp.cashier.pipeline.util.RcbStateUtils;
+ import com.diligrp.cashier.shared.ErrorCode;
+ import com.diligrp.cashier.shared.exception.ServiceAccessException;
+ import com.diligrp.cashier.shared.service.ServiceEndpointSupport;
+ import com.diligrp.cashier.shared.util.DateUtils;
+ import com.diligrp.cashier.shared.util.JsonUtils;
+ import com.diligrp.cashier.shared.util.ObjectUtils;
+ import com.diligrp.cashier.shared.util.RandomUtils;
+ import com.fasterxml.jackson.core.type.TypeReference;
+ import jakarta.annotation.Resource;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ import org.springframework.dao.DataAccessException;
+ import org.springframework.data.redis.core.RedisOperations;
+ import org.springframework.data.redis.core.SessionCallback;
+ import org.springframework.data.redis.core.StringRedisTemplate;
+ import org.springframework.lang.NonNull;
+
+ import javax.net.ssl.SSLContext;
+ import javax.net.ssl.TrustManager;
+ import javax.net.ssl.X509TrustManager;
+ import java.security.cert.X509Certificate;
+ import java.time.Instant;
+ import java.time.LocalDate;
+ import java.time.LocalDateTime;
+ import java.time.ZoneId;
+ import java.util.*;
+ import java.util.concurrent.TimeUnit;
+
+ /**
+ * 安徽农商银行聚合支付客户端
+ */
+public class RcbOnlineHttpClient extends ServiceEndpointSupport {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RcbOnlineHttpClient.class);
+
+    // 微信API BASE URL
+    private static final String WECHAT_BASE_URL = "https://api.weixin.qq.com";
+    // code2session接口: 根据登录凭证code获取登录信息
+    private static final String CODE_TO_SESSION = "/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code";
+
+    private static final int STATUS_OK = 200;
+
+    private final String uri;
+
+    private final String merchantNo;
+
+    private final String terminalNo;
+
+    private final String key;
+
+    private final String appId;
+
+     @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    public RcbOnlineHttpClient(String uri, String merchantNo, String terminalNo, String key, String appId) {
+        this.uri = uri;
+        this.merchantNo = merchantNo;
+        this.terminalNo = terminalNo;
+        this.key = key;
+        this.appId = appId;
+    }
+
+     public String sendMiniProPrepayRequest(MiniProPrepayRequest request, String notifyUrl) {
+         Map<String, String> params = new HashMap<>();
+         params.put("merchantNo", merchantNo);
+         params.put("terminalNo", terminalNo);
+         params.put("batchNo", getBatchNo());
+         params.put("traceNo", getTraceNo());
+         params.put("outTradeNo", request.getPaymentId());
+         params.put("transAmount", String.valueOf(request.getAmount()));
+         params.put("appid", appId);
+         params.put("openId", request.getOpenId());
+         params.put("timeExpire", "5"); // 5分钟
+         params.put("tradeChannel", "01"); // 微信小程序
+         params.put("notifyUrl", notifyUrl);
+         params.put("nonceStr", RandomUtils.randomString(32));
+         params.put("sign", RcbSignatureUtils.sign(params, key));
+
+         String payload = JsonUtils.toJsonString(params);
+         LOG.debug("Sending rcb minipro prepay request: {}", payload);
+         HttpResult result = send(uri + "/cposp/pay/unifiedorder", payload);
+         if (result.statusCode != STATUS_OK) {
+             LOG.error("Failed to send rcb minipro prepay, statusCode: {}", result.statusCode);
+             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "调用小程序预支付接口失败: " + result.statusCode);
+         }
+         LOG.debug("Received rcb mini pro prepay response: {}", result.responseText);
+
+         Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+         String resultCode = data.get("resultCode");
+         String resultMessage =  data.get("resultMessage");
+         if ("00".equals(resultCode)) {
+             String signature = data.remove("sign");
+             if (!RcbSignatureUtils.verify(data, key, signature)) {
+                 throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "小程序预支付请求数据验签失败");
+             }
+             return data.get("payInfo");
+         } else {
+             LOG.error("Failed to send minipro prepay request, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
+             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "调用小程序预支付接口失败: " + resultMessage);
+         }
+     }
+
+    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder request) {
+        Map<String, String> params = new LinkedHashMap<>();
+        params.put("merchantNo", merchantNo);
+        params.put("terminalNo", terminalNo);
+        params.put("batchNo", getBatchNo());
+        params.put("traceNo", getTraceNo());
+        params.put("outTradeNo", request.getPaymentId());
+        params.put("nonceStr", RandomUtils.randomString(32));
+
+        params.put("sign", RcbSignatureUtils.sign(params, key));
+        String payload = JsonUtils.toJsonString(params);
+        LOG.debug("Sending rcb order query request: {}", payload);
+        HttpResult result = send(uri + "/cposp/pay/orderQuery", payload);
+        if (result.statusCode != STATUS_OK) {
+            LOG.error("Failed to query rcb order, statusCode: {}", result.statusCode);
+            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "查询支付状态失败: " + result.statusCode);
+        }
+        LOG.debug("Received rcb order query response: {}", result.responseText);
+
+        Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+        String signature = data.remove("sign");
+        if (!RcbSignatureUtils.verify(data, key, signature)) {
+            throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "查询支付状态数据验签失败");
+        }
+
+        String resultCode = data.get("resultCode");
+        String resultMessage =  data.get("resultMessage");
+        if ("00".equals(resultCode)) {
+            String orderStatus = data.get("orderStatus");
+            String errorDesc = data.get("errorDesc");
+            String outTradeNo = data.get("cposOrderId");
+            OutPaymentType paymentType = RcbStateUtils.outPayType(data.get("tradeChannel"));
+            LocalDateTime when = LocalDateTime.now().withNano(0);
+            // 不能使用paidTime或transTime, paidTime只有年月日,transTime是订单发起时间
+            // 当前未设计存储支付时间字段（采用记录修改时间作为支付时间），因此采用当前时间作为记录修改时间
+            String timeEnd = data.get("timeEnd");
+            if (ObjectUtils.isNotEmpty(timeEnd)) {
+                long timestamp = Long.parseLong(timeEnd); // ⽀付完成时间戳
+                Instant instant = Instant.ofEpochMilli(timestamp);
+                when = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+            }
+            String payUserInfo = data.get("payUserInfo");
+            // 第三方支付通道的订单编号，比如：微信订单
+            // String outOrderId = data.get("chnOrderId");
+            return new OnlinePaymentResponse(request.getPaymentId(), outTradeNo, paymentType,
+                payUserInfo, when, RcbStateUtils.paymentState(orderStatus), errorDesc);
+        } else {
+            LOG.error("Failed to query rcb order, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
+            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "调用支付结果查询接口失败");
+        }
+    }
+
+     public void closePrepayOrder(OnlinePrepayOrder request) {
+         Map<String, String> params = new HashMap<>();
+         params.put("merchantNo", merchantNo);
+         params.put("terminalNo", terminalNo);
+         params.put("batchNo", getBatchNo());
+         params.put("traceNo", getTraceNo());
+         params.put("outTradeNo", request.getPaymentId());
+         params.put("nonceStr", RandomUtils.randomString(32));
+         params.put("sign", RcbSignatureUtils.sign(params, key));
+
+         String payload = JsonUtils.toJsonString(params);
+         LOG.info("Sending close rcb order request: {}", payload);
+         HttpResult result = send(uri + "/cposp/pay/closeOrder", payload);
+         if (result.statusCode != STATUS_OK) {
+             LOG.error("Failed to close rcb order, statusCode: {}", result.statusCode);
+             throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "关闭支付订单失败: " + result.statusCode);
+         }
+         LOG.info("Received close rcb order response: {}", result.responseText);
+
+         Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+         String resultCode = data.get("resultCode");
+         String resultMessage =  data.get("resultMessage");
+         if (!"00".equals(resultCode)) {
+             LOG.error("Failed to close rcb order, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
+             throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "关闭支付订单失败");
+         }
+
+         String signature = data.remove("sign");
+         if (!RcbSignatureUtils.verify(data, key, signature)) {
+             throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "关闭订单数据验签失败");
+         }
+     }
+
+    public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
+        Map<String, String> params = new HashMap<>();
+        params.put("merchantNo", merchantNo);
+        params.put("terminalNo", terminalNo);
+        params.put("batchNo", getBatchNo());
+        params.put("traceNo", getTraceNo());
+        params.put("mchtRefundNo", request.getRefundId());
+        params.put("outTradeNo", request.getPaymentId());
+        params.put("refundAmount", String.valueOf(request.getAmount()));
+        params.put("nonceStr", RandomUtils.randomString(32));
+        params.put("sign", RcbSignatureUtils.sign(params, key));
+
+        LocalDateTime now = LocalDateTime.now();
+        String payload = JsonUtils.toJsonString(params);
+        LOG.debug("Sending refund request: {}", payload);
+        HttpResult result = send(uri + "/cposp/pay/refund", payload);
+        if (result.statusCode != STATUS_OK) {
+            LOG.error("Failed to refund rcb order, statusCode: {}", result.statusCode);
+            throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "发送退款请求失败: " + result.statusCode);
+        }
+        LOG.debug("Received rcb order refund response: {}", result.responseText);
+
+        Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+        String resultCode = data.get("resultCode");
+        String resultMessage =  data.get("resultMessage");
+        if (!"00".equals(resultCode)) {
+            LOG.error("Failed to refund, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
+            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "发送退款请求失败");
+        }
+
+        String signature = data.remove("sign");
+        if (!RcbSignatureUtils.verify(data, key, signature)) {
+            throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "退款接口数据验签失败");
+        }
+        String refundStatus = data.get("refundStatus");
+        String cposRefundOrderId = data.get("cposRefundOrderId");
+        PaymentState refundState = RcbStateUtils.refundState(refundStatus);
+        return new OnlineRefundResponse(request.getRefundId(), cposRefundOrderId, now, refundState, RcbStateUtils.refundInfo(refundState));
+    }
+
+    /**
+     * 各交易终端，每⽇第⼀笔交易时，需要通过签到，获取批次号等信息。
+     *
+     * @return 批次号
+     */
+    protected String getBatchNo() {
+        try {
+            String key = "rcb:online:batchNo" + DateUtils.formatDate(LocalDate.now(), DateUtils.YYYYMMDD);
+            String batchNo = stringRedisTemplate.opsForValue().get(key);
+            if (batchNo != null) {
+                return batchNo;
+            }
+
+            String payload = String.format("{\"merchantNo\": \"%s\", \"terminalNo\": \"%s\"}", merchantNo, terminalNo);
+            LOG.debug("Sending signIn request: {}", payload);
+            HttpResult result = send(uri + "/cposp/pay/signIn", payload);
+            if (result.statusCode != STATUS_OK) {
+                LOG.error("Failed to get rcb batch no, statusCode: {}", result.statusCode);
+                throw new PaymentPipelineException(ErrorCode.SYSTEM_UNKNOWN_ERROR, "获取签到批次号: " + result.statusCode);
+            }
+            LOG.debug("Received rcb signIn response: {}", result.responseText);
+
+            Map<String, String> data = JsonUtils.fromJsonString(result.responseText, new TypeReference<>() {});
+            String resultCode = data.get("resultCode");
+            String resultMessage =  data.get("resultMessage");
+            if ("00".equals(resultCode)) {
+                batchNo = data.get("batchNo");
+                stringRedisTemplate.opsForValue().set(key, batchNo, 36 * 60 * 60, TimeUnit.SECONDS);
+                return batchNo;
+            } else {
+                LOG.error("Failed to rcb sign in, errorCode: {}, resultMessage: {}", resultCode, resultMessage);
+                throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "签到接口调用失败");
+            }
+        } catch (ServiceAccessException | PaymentPipelineException rex) {
+            throw rex;
+        } catch (Exception ex) {
+            LOG.error("Failed to get rcb sign in batchNo", ex);
+            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "获取签到批次号失败");
+        }
+    }
+
+    protected String getTraceNo() {
+        try {
+            String key = "rcb:online:traceNo" + DateUtils.formatDate(LocalDate.now(), DateUtils.YYYYMMDD);
+            StringBuilder traceNo = new StringBuilder();
+
+            List<Object> results = stringRedisTemplate.executePipelined(new SessionCallback<Object>() {
+                @Override
+                public Object execute(@NonNull RedisOperations operations) throws DataAccessException {
+                    operations.opsForValue().increment(key);
+                    operations.expire(key, 36 * 60 * 60, TimeUnit.SECONDS);
+                    return null;
+                }
+            });
+
+            traceNo.append(results.getFirst());
+            int length = traceNo.length();
+            if (length < 6) {
+                for (int i = length; i < 6; i++) {
+                    traceNo.insert(0, "0");
+                }
+            }
+            return traceNo.toString();
+        } catch (Exception ex) {
+            LOG.error("Failed to get traceNo", ex);
+            throw new PaymentPipelineException(ErrorCode.SERVICE_ACCESS_ERROR, "获取系统跟踪号失败");
+        }
+    }
+
+     protected Optional<javax.net.ssl.SSLContext> buildSSLContext() {
+         SSLContext sslContext = null;
+         try {
+             TrustManager[] trustAllCerts = new javax.net.ssl.TrustManager[] {
+                 new X509TrustManager() {
+                     @Override
+                     public void checkClientTrusted(X509Certificate[] x509Certificates, String s) {
+                     }
+
+                     @Override
+                     public void checkServerTrusted(X509Certificate[] x509Certificates, String s) {
+                     }
+
+                     @Override
+                     public X509Certificate[] getAcceptedIssuers() {
+                         return new X509Certificate[0];
+                     }
+                 }
+             };
+             sslContext = SSLContext.getInstance("SSL");
+             sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+         } catch (Exception ex) {
+             LOG.error("Build SSLContext failed", ex);
+         }
+         return Optional.ofNullable(sslContext);
+     }
+
+    private static class AuthorizationSession {
+        // 用户唯一标识
+        private String openid;
+        // 会话密钥
+        private String session_key;
+        // 用户在开放平台的唯一标识
+        private String unionid;
+        // 错误码
+        private Integer errcode;
+        // 错误信息
+        private String errmsg;
+
+        public String getOpenid() {
+            return openid;
+        }
+
+        public void setOpenid(String openid) {
+            this.openid = openid;
+        }
+
+        public String getSession_key() {
+            return session_key;
+        }
+
+        public void setSession_key(String session_key) {
+            this.session_key = session_key;
+        }
+
+        public String getUnionid() {
+            return unionid;
+        }
+
+        public void setUnionid(String unionid) {
+            this.unionid = unionid;
+        }
+
+        public Integer getErrcode() {
+            return errcode;
+        }
+
+        public void setErrcode(Integer errcode) {
+            this.errcode = errcode;
+        }
+
+        public String getErrmsg() {
+            return errmsg;
+        }
+
+        public void setErrmsg(String errmsg) {
+            this.errmsg = errmsg;
+        }
+    }
+}
@@ -53,8 +53,8 @@ public class WechatDirectHttpClient extends WechatHttpClient {
      * Native支付下单, 返回二维码链接
      */
     @Override
-    public NativePrepayResponse sendNativePrepayRequest(NativePrepayRequest request, String notifyUri) throws Exception {
-        String payload = nativePrepayRequest(request, notifyUri);
+    public NativePrepayResponse sendNativePrepayRequest(NativePrepayRequest request, String notifyUrl) throws Exception {
+        String payload = nativePrepayRequest(request, notifyUrl);
         // 获取认证信息和签名信息
         String authorization = WechatSignatureUtils.authorization(wechatConfig.getMchId(), WechatConstants.HTTP_POST,
             NATIVE_PREPAY, payload, wechatConfig.getPrivateKey(), wechatConfig.getSerialNo());
@@ -81,8 +81,8 @@ public class WechatDirectHttpClient extends WechatHttpClient {
      * 小程序支付下单
      */
     @Override
-    public String sendMiniProPrepayRequest(MiniProPrepayRequest request, String notifyUri) throws Exception {
-        String payload = miniProPrepayRequest(request, notifyUri);
+    public String sendMiniProPrepayRequest(MiniProPrepayRequest request, String notifyUrl) throws Exception {
+        String payload = miniProPrepayRequest(request, notifyUrl);
         // 获取认证信息和签名信息
         String authorization = WechatSignatureUtils.authorization(wechatConfig.getMchId(), WechatConstants.HTTP_POST, JSAPI_PREPAY,
             payload, wechatConfig.getPrivateKey(), wechatConfig.getSerialNo());
@@ -54,8 +54,8 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
      * Native支付下单, 返回二维码链接
      */
     @Override
-    public NativePrepayResponse sendNativePrepayRequest(NativePrepayRequest request, String notifyUri) throws Exception {
-        String payload = nativePrepayRequest(request, notifyUri);
+    public NativePrepayResponse sendNativePrepayRequest(NativePrepayRequest request, String notifyUrl) throws Exception {
+        String payload = nativePrepayRequest(request, notifyUrl);
         // 获取认证信息和签名信息
         String authorization = WechatSignatureUtils.authorization(wechatConfig.getMchId(), WechatConstants.HTTP_POST, NATIVE_PREPAY,
             payload, wechatConfig.getPrivateKey(), wechatConfig.getSerialNo());
@@ -82,8 +82,8 @@ public class WechatPartnerHttpClient extends WechatHttpClient {
      * 小程序支付下单, 返回prepay_id
      */
     @Override
-    public String sendMiniProPrepayRequest(MiniProPrepayRequest request, String notifyUri) throws Exception {
-        String payload = miniProPrepayRequest(request, notifyUri);
+    public String sendMiniProPrepayRequest(MiniProPrepayRequest request, String notifyUrl) throws Exception {
+        String payload = miniProPrepayRequest(request, notifyUrl);
         // 获取认证信息和签名信息
         String authorization = WechatSignatureUtils.authorization(wechatConfig.getMchId(), WechatConstants.HTTP_POST, JSAPI_PREPAY,
             payload, wechatConfig.getPrivateKey(), wechatConfig.getSerialNo());
@@ -27,8 +27,8 @@ public class DiliCardPipeline extends PaymentPipeline&lt;DiliCardPipeline.CardParam
     public DiliCardPipeline(long mchId, long pipelineId, String name, String uri, String params) throws Exception {
         super(mchId, pipelineId, name, uri, params);
         CardParams config = params();
-        AssertUtils.notNull(config.getOutMchId(), "园区卡支付缺少参数配置: outMchId");
-        AssertUtils.notNull(config.getAccountId(), "园区卡支付缺少参数配置: accountId");
+        checkParam(config.getOutMchId(), "outMchId");
+        checkParam(config.getAccountId(), "accountId");
         this.strategy = new DefaultTimeStrategy();
         this.client = new CardPaymentHttpClient(uri, config.getOutMchId(), config.getAccountId());
@@ -7,6 +7,7 @@ import com.diligrp.cashier.shared.util.ObjectUtils;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 /**
  * 所有支付通道的基类, 目前分两类支付通道: 在线支付通道、园区卡支付通道
@@ -65,12 +66,18 @@ public abstract class PaymentPipeline&lt;T extends PaymentPipeline.PipelineParams&gt; 
         return params;
     }
-    protected void checkParam(String label, String value) {
+    protected void checkParam(String value, String label) {
         if (ObjectUtils.isEmpty(value)) {
             throw new PaymentPipelineException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, String.format("支付通道缺少参数配置: %s", label));
         }
     }
+    protected void checkParam(Object value, String label) {
+        if (Objects.isNull(value)) {
+            throw new PaymentPipelineException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, String.format("支付通道缺少参数配置: %s", label));
+        }
+    }
+
     protected static abstract class PipelineParams {
         public PipelineParams(String params) {
             parseParams(params);
+package com.diligrp.cashier.pipeline.core;
+
+import com.diligrp.cashier.pipeline.Constants;
+import com.diligrp.cashier.pipeline.client.RcbOnlineHttpClient;
+import com.diligrp.cashier.pipeline.domain.*;
+import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
+import com.diligrp.cashier.pipeline.type.ChannelType;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+import com.diligrp.cashier.shared.ErrorCode;
+import com.diligrp.cashier.shared.util.ObjectUtils;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+/**
+ * 农商行聚合支付通道
+ */
+public class RcbOnlinePipeline extends OnlinePipeline<RcbOnlinePipeline.RcbParams> {
+
+    private final ScanTimeStrategy strategy;
+
+    private final RcbOnlineHttpClient client;
+
+    public RcbOnlinePipeline(long mchId, long pipelineId, String name, String uri, String params) throws Exception {
+        super(mchId, pipelineId, name, uri, params);
+        if (ObjectUtils.isEmpty(params)) {
+            throw new PaymentPipelineException(ErrorCode.ILLEGAL_ARGUMENT_ERROR, "支付通道未进行参数配置");
+        }
+        RcbParams config = params();
+
+        checkParam(config.getMerchantNo(), "merchantNo");
+        checkParam(config.getTerminalNo(), "terminalNo");
+        checkParam(config.getAppId(), "appId");
+        checkParam(config.getAppSecret(), "appSecret");
+        checkParam(config.getKey(), "key");
+        checkParam(config.getNotifyUrl(), "notifyUrl");
+        this.client = new RcbOnlineHttpClient(uri, config.getMerchantNo(), config.getTerminalNo(), config.getKey(), config.getAppId());
+        this.strategy = new DefaultTimeStrategy();
+    }
+
+    /**
+     * 小程序支付
+     */
+    public MiniProPrepayResponse sendMiniProPrepayRequest(MiniProPrepayRequest request) {
+        String notifyUri = String.format(Constants.RCB_PAYMENT_NOTIFY_URI, params().getNotifyUrl(), request.getPaymentId());
+        request.put(Constants.PARAM_MCH_ID, params().getMerchantNo());
+        String payInfo = client.sendMiniProPrepayRequest(request, notifyUri);
+        // 解析农商行小程序支付信息
+        StringTokenizer tokenizer = new StringTokenizer(payInfo, ";", false);
+        Map<String, String> result = new HashMap<>(8);
+        while (tokenizer.hasMoreTokens()) {
+            String token = tokenizer.nextToken();
+            int index = token.indexOf("=");
+            if (index > 0) {
+                String key = token.substring (0, index).trim ();
+                String value = token.substring (index + 1).trim ();
+                result.put(key, value);
+            }
+        }
+        String prepayId = result.get("tradeNO");
+        String timeStamp = result.get("timeStamp");
+        String nonceStr = result.get("nonceStr");
+//        String packet = result.get("body"); // prepay_id=<prepayId>
+        String signType = result.get("signType");
+        String paySign = result.get("paySign");
+        return MiniProPrepayResponse.of(request.getPaymentId(), prepayId, prepayId, timeStamp, nonceStr, signType, paySign);
+    }
+
+    @Override
+    public OnlinePaymentResponse queryPrepayResponse(OnlinePrepayOrder request) {
+        return client.queryPrepayResponse(request);
+    }
+
+    @Override
+    public void closePrepayOrder(OnlinePrepayOrder request) {
+        client.closePrepayOrder(request);
+    }
+
+    @Override
+    public OnlineRefundResponse sendRefundRequest(OnlineRefundRequest request) {
+        return client.sendRefundRequest(request);
+    }
+
+    @Override
+    public OnlineRefundResponse queryRefundResponse(OnlineRefundOrder request) {
+        return new OnlineRefundResponse(request.getRefundId(), request.getOutTradeNo(), LocalDateTime.now(),
+            PaymentState.PROCESSING, "支付通道不支持退款状态查询");
+    }
+
+    @Override
+    public ScanTimeStrategy getTimeStrategy() {
+        return strategy;
+    }
+
+    @Override
+    public ChannelType supportedChannel() {
+        return ChannelType.RCB;
+    }
+
+    @Override
+    public Class<RcbParams> paramClass() {
+        return RcbParams.class;
+    }
+
+    public static class RcbParams extends PaymentPipeline.PipelineParams {
+        public RcbParams(String params) {
+            super(params);
+        }
+
+        private String merchantNo;
+
+        private String terminalNo;
+
+        private String appId;
+
+        private String appSecret;
+
+        private String key;
+
+        private String notifyUrl;
+
+        public String getMerchantNo() {
+            return merchantNo;
+        }
+
+        public void setMerchantNo(String merchantNo) {
+            this.merchantNo = merchantNo;
+        }
+
+        public String getTerminalNo() {
+            return terminalNo;
+        }
+
+        public void setTerminalNo(String terminalNo) {
+            this.terminalNo = terminalNo;
+        }
+
+        public String getAppId() {
+            return appId;
+        }
+
+        public void setAppId(String appId) {
+            this.appId = appId;
+        }
+
+        public String getAppSecret() {
+            return appSecret;
+        }
+
+        public void setAppSecret(String appSecret) {
+            this.appSecret = appSecret;
+        }
+
+        public String getKey() {
+            return key;
+        }
+
+        public void setKey(String key) {
+            this.key = key;
+        }
+
+        public String getNotifyUrl() {
+            return notifyUrl;
+        }
+
+        public void setNotifyUrl(String notifyUrl) {
+            this.notifyUrl = notifyUrl;
+        }
+    }
+}
@@ -32,9 +32,9 @@ public class WechatPartnerPipeline extends WechatPipeline&lt;WechatPartnerPipeline.
     public WechatPartnerPipeline(long mchId, long pipelineId, String name, String uri, String params) throws Exception {
         super(mchId, pipelineId, name, uri, params);
         PartnerWechatParams config = params();
-        AssertUtils.notEmpty(config.getSubMchId(), "微信支付缺少参数配置: subMchId");
-        AssertUtils.notEmpty(config.getSubAppId(), "微信支付缺少参数配置: subAppId");
-        AssertUtils.notEmpty(config.getAppSecret(), "微信支付缺少参数配置: appSecret");
+        checkParam(config.getSubMchId(), "subMchId");
+        checkParam(config.getSubAppId(), "subAppId");
+        checkParam(config.getAppSecret(), "appSecret");
         this.strategy = new DefaultTimeStrategy();
     }
@@ -10,7 +10,6 @@ import com.diligrp.cashier.pipeline.type.ChannelType;
 import com.diligrp.cashier.pipeline.util.WechatConstants;
 import com.diligrp.cashier.shared.ErrorCode;
 import com.diligrp.cashier.shared.security.RsaCipher;
-import com.diligrp.cashier.shared.util.AssertUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,7 +30,7 @@ public abstract class WechatPipeline&lt;T extends WechatPipeline.WechatParams&gt; exte
     public WechatPipeline(long mchId, long pipelineId, String name, String uri, String params) throws Exception {
         super(mchId, pipelineId, name, uri, params);
         WechatParams config = params();
-        AssertUtils.notEmpty(config.getNotifyUrl(), "微信支付缺少参数配置: notifyUrl");
+        checkParam(config.getNotifyUrl(), "notifyUrl");
     }
     /**
@@ -60,6 +60,10 @@ public class PaymentPipelineManagerImpl extends LifeCycle implements IPaymentPip
                 DiliCardPipeline paymentPipeline = new DiliCardPipeline(pipeline.getMchId(), pipeline.getPipelineId(),
                     pipeline.getName(), pipeline.getUri(), pipeline.getParam());
                 registerPaymentPipeline(paymentPipeline);
+            } else if (ChannelType.RCB.equalTo(pipeline.getChannelId())) {
+                RcbOnlinePipeline paymentPipeline = new RcbOnlinePipeline(pipeline.getMchId(), pipeline.getPipelineId(),
+                    pipeline.getName(), pipeline.getUri(), pipeline.getParam());
+                registerPaymentPipeline(paymentPipeline);
             } else {
                 LOG.warn("Ignore payment pipeline configuration: {}", pipeline.getName());
             }
 package com.diligrp.cashier.pipeline.service.impl;
 import com.diligrp.cashier.pipeline.client.WechatHttpClient;
+import com.diligrp.cashier.pipeline.core.OnlinePipeline;
+import com.diligrp.cashier.pipeline.core.RcbOnlinePipeline;
+import com.diligrp.cashier.pipeline.core.WechatDirectPipeline;
 import com.diligrp.cashier.pipeline.core.WechatPartnerPipeline;
-import com.diligrp.cashier.pipeline.core.WechatPipeline;
 import com.diligrp.cashier.pipeline.domain.wechat.UploadShippingRequest;
 import com.diligrp.cashier.pipeline.domain.wechat.WechatAccessToken;
+import com.diligrp.cashier.pipeline.exception.PaymentPipelineException;
 import com.diligrp.cashier.pipeline.service.IPaymentPipelineManager;
 import com.diligrp.cashier.pipeline.service.IWechatPaymentService;
+import com.diligrp.cashier.shared.ErrorCode;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -16,19 +20,26 @@ public class WechatPaymentServiceImpl implements IWechatPaymentService {
     @Resource
     private IPaymentPipelineManager paymentPipelineManager;
+    private WechatHttpClient wechatHttpClient = new WechatHttpClient(null, null);
+
     /**
      * 根据登陆凭证code获取openId
      */
     @Override
     public String openIdByCode(Long pipelineId, String code) {
-        WechatPipeline<?> pipeline = paymentPipelineManager.findPipelineById(pipelineId, WechatPipeline.class);
+        OnlinePipeline<?> pipeline = paymentPipelineManager.findPipelineById(pipelineId, OnlinePipeline.class);
         if (pipeline instanceof WechatPartnerPipeline partnerPipeline) {
             // 服务商模式下使用WechatParams配置的信息获取openId
             WechatPartnerPipeline.PartnerWechatParams params = partnerPipeline.params();
-            return pipeline.getClient().loginAuthorization(params.getSubAppId(), params.getAppSecret(), code);
-        } else {
+            return partnerPipeline.getClient().loginAuthorization(params.getSubAppId(), params.getAppSecret(), code);
+        } else if (pipeline instanceof WechatDirectPipeline  directPipeline) {
             // 直连模式直接使用WebConfig配置的信息获取openId
-            return pipeline.getClient().loginAuthorization(code);
+            return directPipeline.getClient().loginAuthorization(code);
+        } else if (pipeline instanceof RcbOnlinePipeline rcbOnlinePipeline) {
+            RcbOnlinePipeline.RcbParams params = rcbOnlinePipeline.params();
+            return wechatHttpClient.loginAuthorization(params.getAppId(), params.getAppSecret(), code);
+        } else {
+            throw new PaymentPipelineException(ErrorCode.OPERATION_NOT_ALLOWED, "该支付通道不支持此操作");
         }
     }
+package com.diligrp.cashier.pipeline.util;
+
+import com.diligrp.cashier.shared.security.HexUtils;
+import com.diligrp.cashier.shared.util.ObjectUtils;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+
+/**
+ * 安徽农商行的聚合支付文档中并未提到验签功能
+ */
+public final class RcbSignatureUtils {
+    public static String sign(Map<String, String> params, String key) {
+        String data = map2String(params).concat("&key=").concat(key);
+        MessageDigest md5;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            md5.update(data.getBytes(StandardCharsets.UTF_8));
+            return HexUtils.encodeHexStr(md5.digest(), false);
+        } catch (NoSuchAlgorithmException ex) {
+            // Never happened
+            throw new RuntimeException(ex);
+        }
+    }
+
+    public static boolean verify(Map<String, String> params, String key, String signature) {
+        String data = sign(params, key);
+        return data.equals(signature);
+    }
+
+    public static boolean verify(String params, String key, String signature) {
+        String data = params.concat("&key=").concat(key);
+        MessageDigest md5 = null;
+        try {
+            md5 = MessageDigest.getInstance("MD5");
+            md5.update(data.getBytes(StandardCharsets.UTF_8));
+            String toBeSigned = HexUtils.encodeHexStr(md5.digest(), false);
+            return toBeSigned.equals(signature);
+        } catch (NoSuchAlgorithmException ex) {
+            // Never happened
+            throw new RuntimeException(ex);
+        }
+
+    }
+
+    public static String map2String(Map<String, String> params) {
+        TreeMap<String, String> data = new TreeMap<>(Comparator.naturalOrder());
+        data.putAll(params);
+        return data.entrySet().stream().filter(e -> ObjectUtils.isNotEmpty(e.getValue()))
+            .map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining("&", "", ""));
+    }
+}
+package com.diligrp.cashier.pipeline.util;
+
+import com.diligrp.cashier.pipeline.type.OutPaymentType;
+import com.diligrp.cashier.pipeline.type.PaymentState;
+
+public final class RcbStateUtils {
+    public static PaymentState paymentState(String orderStatus) {
+        return switch (orderStatus) {
+            case "3", "6" -> PaymentState.SUCCESS; // 3-交易成功; 6-交易成功但有退款
+            case "1", "2" -> PaymentState.PROCESSING;
+            default -> PaymentState.FAILED;
+        };
+    }
+
+    public static PaymentState refundState(String orderStatus) {
+        return switch (orderStatus) {
+            case "01" -> PaymentState.SUCCESS;
+            case "02" -> PaymentState.FAILED;
+            default -> PaymentState.PROCESSING;
+        };
+    }
+
+    public static String refundInfo(PaymentState refundState) {
+        return switch (refundState) {
+            case SUCCESS -> "退款成功";
+            case FAILED -> "退款失败";
+            default -> "退款处理中";
+        };
+    }
+
+    public static OutPaymentType outPayType(String tradeChannel) {
+        return switch (tradeChannel) {
+            case "01" -> OutPaymentType.WXPAY; // 微信
+            case "02" -> OutPaymentType.ALIPAY; // 支付宝
+            case "04" -> OutPaymentType.UPAY; // 银联
+            default -> OutPaymentType.NOP; // 未知支付方式
+        };
+    }
+}
@@ -16,6 +16,12 @@ import java.util.Date;
  */
 public class DateUtils {
+    public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
+    public static final String YYYY_MM_DD = "yyyy-MM-dd";
+
+    public static final String YYYYMMDD = "yyyyMMdd";
+
     public static String formatDateTime(LocalDateTime when, String format) {
         if (ObjectUtils.isNull(when)) {
             return null;
@@ -6,6 +6,8 @@ INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id
 VALUES (1001, 10011, 10, 10, '中瑞微信服务商支付通道', 'https://api.mch.weixin.qq.com', '{"subMchId":"1679224186", "subAppId":"wxad27b69b888b6dc9", "appSecret":"9c254c0ab932b3c30292a05679a688f7", "notifyUrl": "https://cashier.test.gszdtop.com"}', 1, now(), now());
 INSERT INTO `dili_cashier`.upay_wechat_param(pipeline_id, mch_id, app_id, app_secret, serial_no, private_key, wechat_serial_no, wechat_public_key, api_v3_key, type, created_time)
 VALUES(10011, '1679223106', 'wxca99d56a6ab15f29', '9c254c0ab932b3c30292a05679a688f7', '60C2877836D1D618D2E40186995BB00299D92F44','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', 'RSfFvEBBQiHz8GZyDcP2eSUlZJgKjdxk', 2, now());
--- 根据环境配置不同的uri
+
+INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
+VALUES (1001, 10014, 29, 2, '中瑞农商行聚合支付通道', 'https://epos.ahrcu.com:3443', '{"merchantNo": "94734065411016B", "terminalNo": "19A03301", "appId": "wx6f15ee0bd788c744", "appSecret": "4ab4152adf21da99c629fe7f3ce6b571", "key": "45913E42F86C18F512BEF54C2F0FE5BF", "notifyUrl": "https://cashier.test.gszdtop.com"}', 1, now(), now());
 INSERT INTO `dili_cashier`.upay_payment_pipeline(mch_id, pipeline_id, channel_id, type, name, uri, param, state, created_time, modified_time)
 VALUES (1001, 10012, 19, 2, '中瑞园区卡支付通道', 'http://gateway.dev.nong12.com/pay-service', '{"outMchId": 9, "accountId": 118924}', 1, now(), now());