From e5d44006cf478b2fb842f886a9131b49db226b80 Mon Sep 17 00:00:00 2001 From: dingzhiwei Date: Fri, 18 Jun 2021 14:59:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E7=94=9F=E6=88=90=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeequan/jeepay/core/utils/SeqKit.java | 19 ++++++++++++++----- .../ctrl/refund/RefundOrderController.java | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/SeqKit.java b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/SeqKit.java index 2c9bb78..d988283 100644 --- a/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/SeqKit.java +++ b/jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/SeqKit.java @@ -25,20 +25,29 @@ import java.util.concurrent.atomic.AtomicLong; * 序列号生成 工具类 * * @author terrfly +* @author jmdhappy * @site https://www.jeepay.vip * @date 2021/6/8 16:56 */ public class SeqKit { - private static final AtomicLong BUY_ORDER_SEQ = new AtomicLong(0L); - private static final String BUY_ORDER_SEQ_PREFIX = "P"; + private static final AtomicLong PAY_ORDER_SEQ = new AtomicLong(0L); + private static final AtomicLong REFUND_ORDER_SEQ = new AtomicLong(0L); + private static final String PAY_ORDER_SEQ_PREFIX = "P"; + private static final String REFUND_ORDER_SEQ_PREFIX = "R"; - /** 生成购买订单ID **/ + /** 生成支付订单号 **/ public static String genPayOrderId() { + return String.format("%s%s%04d",PAY_ORDER_SEQ_PREFIX, + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_MS_PATTERN), + (int) PAY_ORDER_SEQ.getAndIncrement() % 10000); + } - return String.format("%s%s%04d",BUY_ORDER_SEQ_PREFIX, + /** 生成退款订单号 **/ + public static String genRefundOrderId() { + return String.format("%s%s%04d",REFUND_ORDER_SEQ_PREFIX, DateUtil.format(new Date(), DatePattern.PURE_DATETIME_MS_PATTERN), - (int) BUY_ORDER_SEQ.getAndIncrement() % 10000); + (int) REFUND_ORDER_SEQ.getAndIncrement() % 10000); } } diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/refund/RefundOrderController.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/refund/RefundOrderController.java index d2db673..7b10adb 100644 --- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/refund/RefundOrderController.java +++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/ctrl/refund/RefundOrderController.java @@ -178,7 +178,7 @@ public class RefundOrderController extends ApiController { Date nowTime = new Date(); RefundOrder refundOrder = new RefundOrder(); - refundOrder.setRefundOrderId(SeqKit.genPayOrderId()); //退款订单号 + refundOrder.setRefundOrderId(SeqKit.genRefundOrderId()); //退款订单号 refundOrder.setPayOrderId(payOrder.getPayOrderId()); //支付订单号 refundOrder.setChannelPayOrderNo(payOrder.getChannelOrderNo()); //渠道支付单号 refundOrder.setMchNo(mchInfo.getMchNo()); //商户号 -- GitLab