From ff0623cced69e944043f7f568ba161ee8275e90c Mon Sep 17 00:00:00 2001 From: terrfly Date: Tue, 22 Jun 2021 09:38:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E9=80=80=E6=AC=BE=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E8=A7=84=E5=88=99=EF=BC=8C=20=E5=95=86?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=BA=94=E7=94=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeequan/jeepay/core/utils/SeqKit.java | 10 ++++++++++ .../jeepay/mgr/ctrl/order/PayOrderController.java | 6 ++---- .../jeepay/mch/ctrl/merchant/MchAppController.java | 2 +- 3 files changed, 13 insertions(+), 5 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 d988283..64f2848 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 @@ -33,8 +33,10 @@ public class SeqKit { private static final AtomicLong PAY_ORDER_SEQ = new AtomicLong(0L); private static final AtomicLong REFUND_ORDER_SEQ = new AtomicLong(0L); + private static final AtomicLong MHO_ORDER_SEQ = new AtomicLong(0L); private static final String PAY_ORDER_SEQ_PREFIX = "P"; private static final String REFUND_ORDER_SEQ_PREFIX = "R"; + private static final String MHO_ORDER_SEQ_PREFIX = "M"; /** 生成支付订单号 **/ public static String genPayOrderId() { @@ -50,4 +52,12 @@ public class SeqKit { (int) REFUND_ORDER_SEQ.getAndIncrement() % 10000); } + + /** 模拟生成商户订单号 **/ + public static String genMhoOrderId() { + return String.format("%s%s%04d", MHO_ORDER_SEQ_PREFIX, + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_MS_PATTERN), + (int) MHO_ORDER_SEQ.getAndIncrement() % 10000); + } + } diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java index d94fab8..59fa2c2 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java @@ -15,11 +15,9 @@ */ package com.jeequan.jeepay.mgr.ctrl.order; -import cn.hutool.core.lang.UUID; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.api.R; import com.jeequan.jeepay.JeepayClient; import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.constants.ApiCodeEnum; @@ -28,10 +26,10 @@ import com.jeequan.jeepay.core.entity.PayOrder; import com.jeequan.jeepay.core.entity.PayWay; import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.ApiRes; +import com.jeequan.jeepay.core.utils.SeqKit; import com.jeequan.jeepay.exception.JeepayException; import com.jeequan.jeepay.mgr.ctrl.CommonCtrl; import com.jeequan.jeepay.model.RefundOrderCreateReqModel; -import com.jeequan.jeepay.model.RefundOrderCreateResModel; import com.jeequan.jeepay.request.RefundOrderCreateRequest; import com.jeequan.jeepay.response.RefundOrderCreateResponse; import com.jeequan.jeepay.service.impl.MchAppService; @@ -154,7 +152,7 @@ public class PayOrderController extends CommonCtrl { model.setMchNo(payOrder.getMchNo()); // 商户号 model.setAppId(payOrder.getAppId()); model.setPayOrderId(payOrderId); - model.setMchRefundNo(UUID.fastUUID().toString()); + model.setMchRefundNo(SeqKit.genMhoOrderId()); model.setRefundAmount(refundAmount); model.setRefundReason(refundReason); model.setCurrency("CNY"); diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java index 0e7db58..557e7d9 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java @@ -63,7 +63,7 @@ public class MchAppController extends CommonCtrl { if (mchApp.getState() != null) wrapper.eq(MchApp::getState, mchApp.getState()); wrapper.orderByDesc(MchApp::getCreatedAt); - IPage pages = mchAppService.page(getIPage(), wrapper); + IPage pages = mchAppService.page(getIPage(true), wrapper); return ApiRes.ok(pages); } -- GitLab