Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
计全科技
jeepay
提交
ff0623cc
jeepay
项目概览
计全科技
/
jeepay
通知
10
Star
3
Fork
2
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
6
Wiki
分析
仓库
DevOps
项目成员
Pages
jeepay
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
6
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
ff0623cc
编写于
6月 22, 2021
作者:
terrfly
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
变更退款订单号规则, 商户查询应用列表支持全部数据显示;
上级
7f76ba9d
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
13 addition
and
5 deletion
+13
-5
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/SeqKit.java
...e/src/main/java/com/jeequan/jeepay/core/utils/SeqKit.java
+10
-0
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java
...com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java
+2
-4
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
...om/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
+1
-1
未找到文件。
jeepay-core/src/main/java/com/jeequan/jeepay/core/utils/SeqKit.java
浏览文件 @
ff0623cc
...
@@ -33,8 +33,10 @@ public class SeqKit {
...
@@ -33,8 +33,10 @@ public class SeqKit {
private
static
final
AtomicLong
PAY_ORDER_SEQ
=
new
AtomicLong
(
0L
);
private
static
final
AtomicLong
PAY_ORDER_SEQ
=
new
AtomicLong
(
0L
);
private
static
final
AtomicLong
REFUND_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
PAY_ORDER_SEQ_PREFIX
=
"P"
;
private
static
final
String
REFUND_ORDER_SEQ_PREFIX
=
"R"
;
private
static
final
String
REFUND_ORDER_SEQ_PREFIX
=
"R"
;
private
static
final
String
MHO_ORDER_SEQ_PREFIX
=
"M"
;
/** 生成支付订单号 **/
/** 生成支付订单号 **/
public
static
String
genPayOrderId
()
{
public
static
String
genPayOrderId
()
{
...
@@ -50,4 +52,12 @@ public class SeqKit {
...
@@ -50,4 +52,12 @@ public class SeqKit {
(
int
)
REFUND_ORDER_SEQ
.
getAndIncrement
()
%
10000
);
(
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
);
}
}
}
jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/order/PayOrderController.java
浏览文件 @
ff0623cc
...
@@ -15,11 +15,9 @@
...
@@ -15,11 +15,9 @@
*/
*/
package
com.jeequan.jeepay.mgr.ctrl.order
;
package
com.jeequan.jeepay.mgr.ctrl.order
;
import
cn.hutool.core.lang.UUID
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.api.R
;
import
com.jeequan.jeepay.JeepayClient
;
import
com.jeequan.jeepay.JeepayClient
;
import
com.jeequan.jeepay.core.aop.MethodLog
;
import
com.jeequan.jeepay.core.aop.MethodLog
;
import
com.jeequan.jeepay.core.constants.ApiCodeEnum
;
import
com.jeequan.jeepay.core.constants.ApiCodeEnum
;
...
@@ -28,10 +26,10 @@ import com.jeequan.jeepay.core.entity.PayOrder;
...
@@ -28,10 +26,10 @@ import com.jeequan.jeepay.core.entity.PayOrder;
import
com.jeequan.jeepay.core.entity.PayWay
;
import
com.jeequan.jeepay.core.entity.PayWay
;
import
com.jeequan.jeepay.core.exception.BizException
;
import
com.jeequan.jeepay.core.exception.BizException
;
import
com.jeequan.jeepay.core.model.ApiRes
;
import
com.jeequan.jeepay.core.model.ApiRes
;
import
com.jeequan.jeepay.core.utils.SeqKit
;
import
com.jeequan.jeepay.exception.JeepayException
;
import
com.jeequan.jeepay.exception.JeepayException
;
import
com.jeequan.jeepay.mgr.ctrl.CommonCtrl
;
import
com.jeequan.jeepay.mgr.ctrl.CommonCtrl
;
import
com.jeequan.jeepay.model.RefundOrderCreateReqModel
;
import
com.jeequan.jeepay.model.RefundOrderCreateReqModel
;
import
com.jeequan.jeepay.model.RefundOrderCreateResModel
;
import
com.jeequan.jeepay.request.RefundOrderCreateRequest
;
import
com.jeequan.jeepay.request.RefundOrderCreateRequest
;
import
com.jeequan.jeepay.response.RefundOrderCreateResponse
;
import
com.jeequan.jeepay.response.RefundOrderCreateResponse
;
import
com.jeequan.jeepay.service.impl.MchAppService
;
import
com.jeequan.jeepay.service.impl.MchAppService
;
...
@@ -154,7 +152,7 @@ public class PayOrderController extends CommonCtrl {
...
@@ -154,7 +152,7 @@ public class PayOrderController extends CommonCtrl {
model
.
setMchNo
(
payOrder
.
getMchNo
());
// 商户号
model
.
setMchNo
(
payOrder
.
getMchNo
());
// 商户号
model
.
setAppId
(
payOrder
.
getAppId
());
model
.
setAppId
(
payOrder
.
getAppId
());
model
.
setPayOrderId
(
payOrderId
);
model
.
setPayOrderId
(
payOrderId
);
model
.
setMchRefundNo
(
UUID
.
fastUUID
().
toString
());
model
.
setMchRefundNo
(
SeqKit
.
genMhoOrderId
());
model
.
setRefundAmount
(
refundAmount
);
model
.
setRefundAmount
(
refundAmount
);
model
.
setRefundReason
(
refundReason
);
model
.
setRefundReason
(
refundReason
);
model
.
setCurrency
(
"CNY"
);
model
.
setCurrency
(
"CNY"
);
...
...
jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/merchant/MchAppController.java
浏览文件 @
ff0623cc
...
@@ -63,7 +63,7 @@ public class MchAppController extends CommonCtrl {
...
@@ -63,7 +63,7 @@ public class MchAppController extends CommonCtrl {
if
(
mchApp
.
getState
()
!=
null
)
wrapper
.
eq
(
MchApp:
:
getState
,
mchApp
.
getState
());
if
(
mchApp
.
getState
()
!=
null
)
wrapper
.
eq
(
MchApp:
:
getState
,
mchApp
.
getState
());
wrapper
.
orderByDesc
(
MchApp:
:
getCreatedAt
);
wrapper
.
orderByDesc
(
MchApp:
:
getCreatedAt
);
IPage
<
MchApp
>
pages
=
mchAppService
.
page
(
getIPage
(),
wrapper
);
IPage
<
MchApp
>
pages
=
mchAppService
.
page
(
getIPage
(
true
),
wrapper
);
return
ApiRes
.
ok
(
pages
);
return
ApiRes
.
ok
(
pages
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录