Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fit-finance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fitness-server
fit-finance
Commits
e304fefc
Commit
e304fefc
authored
Jun 24, 2024
by
程裕兵
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:app pay and native pay
parent
65a27cdb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
6 deletions
+13
-6
api/src/main/java/com/jiejing/fitness/finance/api/pay/request/AppPayRequest.java
+4
-1
api/src/main/java/com/jiejing/fitness/finance/api/pay/request/NativePayRequest.java
+3
-1
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
+2
-2
service/src/main/java/com/jiejing/fitness/finance/service/pay/params/AppPayParams.java
+1
-1
service/src/main/java/com/jiejing/fitness/finance/service/pay/params/NativePayParams.java
+3
-1
No files found.
api/src/main/java/com/jiejing/fitness/finance/api/pay/request/AppPayRequest.java
View file @
e304fefc
package
com
.
jiejing
.
fitness
.
finance
.
api
.
pay
.
request
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.annotation.EnumValue
;
import
com.jiejing.common.swagger.EnumMapping
;
import
com.jiejing.fitness.enums.finance.PayOrderTypeEnum
;
import
com.jiejing.paycenter.common.enums.common.PayChannelEnums
;
import
io.swagger.annotations.ApiModel
;
...
...
@@ -35,7 +37,8 @@ public class AppPayRequest {
@ApiModelProperty
(
name
=
"业务订单类型"
,
required
=
true
)
@NotNull
(
message
=
"业务订单类型不能为空"
)
private
PayOrderTypeEnum
orderType
;
@EnumMapping
(
enumClass
=
PayOrderTypeEnum
.
class
)
private
String
orderType
;
@ApiModelProperty
(
name
=
"商品名称"
,
required
=
true
)
@NotBlank
(
message
=
"商品名称不能为空"
)
...
...
api/src/main/java/com/jiejing/fitness/finance/api/pay/request/NativePayRequest.java
View file @
e304fefc
package
com
.
jiejing
.
fitness
.
finance
.
api
.
pay
.
request
;
import
com.alibaba.fastjson.JSONObject
;
import
com.jiejing.common.swagger.EnumMapping
;
import
com.jiejing.fitness.enums.finance.PayOrderTypeEnum
;
import
com.jiejing.paycenter.common.enums.common.PayChannelEnums
;
import
io.swagger.annotations.ApiModel
;
...
...
@@ -35,7 +36,8 @@ public class NativePayRequest {
@ApiModelProperty
(
name
=
"业务订单类型"
,
required
=
true
)
@NotNull
(
message
=
"业务订单类型不能为空"
)
private
PayOrderTypeEnum
orderType
;
@EnumMapping
(
enumClass
=
PayOrderTypeEnum
.
class
)
private
String
orderType
;
@ApiModelProperty
(
name
=
"商品名称"
,
required
=
true
)
@NotBlank
(
message
=
"商品名称不能为空"
)
...
...
service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java
View file @
e304fefc
...
...
@@ -227,7 +227,7 @@ public class PayConvert {
req
.
setPayType
(
PayTypeEnums
.
NATIVE
);
req
.
setGoods
(
params
.
getGoods
());
req
.
setOrderNo
(
params
.
getOrderNo
());
req
.
setOrderType
(
params
.
getOrderType
()
.
getCode
()
);
req
.
setOrderType
(
params
.
getOrderType
());
req
.
setTimeExpire
(
params
.
getTimeExpire
());
req
.
setTradingTime
(
new
Date
());
req
.
setExtra
(
params
.
getExtra
());
...
...
@@ -242,7 +242,7 @@ public class PayConvert {
req
.
setPayType
(
PayTypeEnums
.
APP
);
req
.
setGoods
(
params
.
getGoods
());
req
.
setOrderNo
(
params
.
getOrderNo
());
req
.
setOrderType
(
params
.
getOrderType
()
.
getCode
()
);
req
.
setOrderType
(
params
.
getOrderType
());
req
.
setTimeExpire
(
params
.
getTimeExpire
());
req
.
setTradingTime
(
new
Date
());
req
.
setExtra
(
params
.
getExtra
());
...
...
service/src/main/java/com/jiejing/fitness/finance/service/pay/params/AppPayParams.java
View file @
e304fefc
...
...
@@ -35,7 +35,7 @@ public class AppPayParams {
@ApiModelProperty
(
name
=
"业务订单类型"
,
required
=
true
)
@NotNull
(
message
=
"业务订单类型不能为空"
)
private
PayOrderTypeEnum
orderType
;
private
String
orderType
;
@ApiModelProperty
(
name
=
"商品名称"
,
required
=
true
)
@NotBlank
(
message
=
"商品名称不能为空"
)
...
...
service/src/main/java/com/jiejing/fitness/finance/service/pay/params/NativePayParams.java
View file @
e304fefc
package
com
.
jiejing
.
fitness
.
finance
.
service
.
pay
.
params
;
import
com.alibaba.fastjson.JSONObject
;
import
com.jiejing.common.swagger.EnumMapping
;
import
com.jiejing.fitness.enums.finance.PayOrderTypeEnum
;
import
com.jiejing.paycenter.common.enums.common.PayChannelEnums
;
import
io.swagger.annotations.ApiModel
;
...
...
@@ -35,7 +36,8 @@ public class NativePayParams {
@ApiModelProperty
(
name
=
"业务订单类型"
,
required
=
true
)
@NotNull
(
message
=
"业务订单类型不能为空"
)
private
PayOrderTypeEnum
orderType
;
@EnumMapping
(
enumClass
=
PayOrderTypeEnum
.
class
)
private
String
orderType
;
@ApiModelProperty
(
name
=
"商品名称"
,
required
=
true
)
@NotBlank
(
message
=
"商品名称不能为空"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment