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 d98828358053ed0ea745aff4cd298ed6f352b68b..64f2848ab9277d2072a9c002e67f079155c994a6 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 d94fab863fa8a13b443256dc13a9d1f3c3f33635..59fa2c2a6145e0721c6a06be145cdd88a5d96184 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 0e7db5889a329f8dcc29e504c14208ee3ad4cf66..557e7d9351db41957c765e0013221e827da82f90 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); }