记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
7c02bbe6
Commit
7c02bbe6
authored
Mar 23, 2022
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
copy first
parent
c0a15062
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
1885 additions
and
34 deletions
+1885
-34
GoblinNtfPayResultVo.java
...liquidnet/service/goblin/dto/vo/GoblinNtfPayResultVo.java
+56
-0
GoblinNtfOrderPayAgainParam.java
...net/service/goblin/param/GoblinNtfOrderPayAgainParam.java
+34
-0
GoblinNtfOrderPayCallbackParam.java
.../service/goblin/param/GoblinNtfOrderPayCallbackParam.java
+52
-0
GoblinNtfOrderPayParam.java
...iquidnet/service/goblin/param/GoblinNtfOrderPayParam.java
+52
-0
GoblinNtfOrderRefundCallbackParam.java
...rvice/goblin/param/GoblinNtfOrderRefundCallbackParam.java
+47
-0
IGoblinNftOrderService.java
...uidnet/service/goblin/service/IGoblinNftOrderService.java
+15
-0
GoblinNftOrderRefundServiceImpl.java
.../goblin/service/impl/GoblinNftOrderRefundServiceImpl.java
+0
-17
GoblinNftOrderServiceImpl.java
...ervice/goblin/service/impl/GoblinNftOrderServiceImpl.java
+0
-17
GoblinNftOrderController.java
...et/service/order/controller/GoblinNftOrderController.java
+74
-0
GoblinNftOrderServiceImpl.java
...service/order/service/impl/GoblinNftOrderServiceImpl.java
+1014
-0
GoblinNtfOrderUtils.java
...om/liquidnet/service/order/utils/GoblinNtfOrderUtils.java
+541
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNtfPayResultVo.java
0 → 100644
View file @
7c02bbe6
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
@ApiModel
(
value
=
"GoblinNtfPayResultVo"
,
description
=
"下单唤起支付参数信息"
)
@Data
public
class
GoblinNtfPayResultVo
implements
Serializable
,
Cloneable
{
private
static
final
long
serialVersionUID
=
1L
;
@ApiModelProperty
(
position
=
14
,
value
=
"状态"
)
private
Integer
status
;
@ApiModelProperty
(
position
=
15
,
value
=
"订单ID"
)
private
String
orderId
;
@ApiModelProperty
(
position
=
11
,
value
=
"code"
)
private
String
code
;
@ApiModelProperty
(
position
=
12
,
value
=
"orderCode"
)
private
String
orderCode
;
@ApiModelProperty
(
position
=
13
,
value
=
"orderMasterCode"
)
private
String
orderMasterCode
;
@ApiModelProperty
(
position
=
19
,
value
=
"金额"
)
private
BigDecimal
price
;
@ApiModelProperty
(
position
=
16
,
value
=
"支付类型"
)
private
String
payType
;
@ApiModelProperty
(
position
=
17
,
value
=
"showUrl"
)
private
String
showUrl
;
@ApiModelProperty
(
position
=
18
,
value
=
"returnUrl"
)
private
String
returnUrl
;
@ApiModelProperty
(
position
=
20
,
value
=
"payData"
)
private
Object
payData
;
private
static
final
GoblinNtfPayResultVo
obj
=
new
GoblinNtfPayResultVo
();
public
static
GoblinNtfPayResultVo
getNew
()
{
try
{
return
(
GoblinNtfPayResultVo
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GoblinNtfPayResultVo
();
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNtfOrderPayAgainParam.java
0 → 100644
View file @
7c02bbe6
package
com
.
liquidnet
.
service
.
goblin
.
param
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
@ApiModel
(
value
=
"GoblinNtfOrderPayAgainParam"
,
description
=
"再次支付所需参数"
)
@Data
public
class
GoblinNtfOrderPayAgainParam
{
@ApiModelProperty
(
value
=
"openId"
)
private
String
openId
;
@ApiModelProperty
(
value
=
"订单id"
)
@NotNull
(
message
=
"订单ID不能为空"
)
private
String
orderId
;
@ApiModelProperty
(
value
=
"支付类型"
)
@NotNull
(
message
=
"支付类型不能为空"
)
private
String
payType
;
@ApiModelProperty
(
value
=
"支付来源"
)
@NotNull
(
message
=
"支付来源不能为空"
)
private
String
deviceFrom
;
@ApiModelProperty
(
value
=
"showUrl"
)
private
String
showUrl
;
@ApiModelProperty
(
value
=
"returnUrl"
)
private
String
returnUrl
;
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNtfOrderPayCallbackParam.java
0 → 100644
View file @
7c02bbe6
package
com
.
liquidnet
.
service
.
goblin
.
param
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@ApiModel
(
value
=
"GoblinNtfOrderPayCallbackParam"
,
description
=
"支付成功回调所需参数"
)
@Data
public
class
GoblinNtfOrderPayCallbackParam
implements
Cloneable
{
@ApiModelProperty
(
value
=
"支付状态[1-成功|0-失败]"
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"订单ID"
)
private
String
orderId
;
@ApiModelProperty
(
value
=
"masterOrderCode"
)
private
String
orderCode
;
@ApiModelProperty
(
value
=
"不用管"
)
private
String
orderCodeId
;
@ApiModelProperty
(
value
=
"[写死]HUIFU_PAY_CODE"
)
private
String
code
;
@ApiModelProperty
(
value
=
"不用管"
)
private
BigDecimal
price
;
@ApiModelProperty
(
value
=
"不用管"
)
private
String
type
;
@ApiModelProperty
(
value
=
"汇付相关id"
)
private
String
paymentId
;
@ApiModelProperty
(
value
=
"[写死]huifu"
)
private
String
paymentType
;
@ApiModelProperty
(
value
=
"支付时间"
)
private
String
paymentAt
;
private
static
final
GoblinNtfOrderPayCallbackParam
obj
=
new
GoblinNtfOrderPayCallbackParam
();
public
static
GoblinNtfOrderPayCallbackParam
getNew
()
{
try
{
return
(
GoblinNtfOrderPayCallbackParam
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GoblinNtfOrderPayCallbackParam
();
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNtfOrderPayParam.java
0 → 100644
View file @
7c02bbe6
package
com
.
liquidnet
.
service
.
goblin
.
param
;
import
com.liquidnet.service.goblin.dto.manage.AddressVo
;
import
com.liquidnet.service.goblin.dto.manage.GoblinOrderStoreParam
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
javax.validation.constraints.NotNull
;
import
java.util.ArrayList
;
import
java.util.List
;
@ApiModel
(
value
=
"GoblinNtfOrderPayParam"
,
description
=
"下单所需参数"
)
@Data
public
class
GoblinNtfOrderPayParam
{
@ApiModelProperty
(
value
=
"openId"
)
private
String
openId
;
@ApiModelProperty
(
value
=
"用户id"
)
private
String
uid
;
@ApiModelProperty
(
value
=
"扫码枪code"
)
private
String
authCode
;
@ApiModelProperty
(
value
=
"支付类型"
)
@NotNull
(
message
=
"支付类型不能为空"
)
private
String
payType
;
@ApiModelProperty
(
value
=
"支付来源 [新增micropay-微信扫码支付]"
)
@NotNull
(
message
=
"支付来源不能为空"
)
private
String
deviceFrom
;
@ApiModelProperty
(
value
=
"代理id"
)
private
String
agentId
;
@ApiModelProperty
(
value
=
"收货地址id[虚拟物品不需要]"
)
private
ArrayList
<
String
>
addressIds
;
@ApiModelProperty
(
value
=
"入场人地址vo"
)
private
AddressVo
addressesVo
;
@ApiModelProperty
(
value
=
"showUrl"
)
private
String
showUrl
;
@ApiModelProperty
(
value
=
"returnUrl"
)
private
String
returnUrl
;
@ApiModelProperty
(
value
=
"商品相关参数集合"
)
private
List
<
GoblinOrderStoreParam
>
goblinOrderStoreParamList
;
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNtfOrderRefundCallbackParam.java
0 → 100644
View file @
7c02bbe6
package
com
.
liquidnet
.
service
.
goblin
.
param
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
* <p>
* 退款回掉参数
* </p>
*
* @author jiangxiulong
* @since 2021-05-31 11:19 上午
*/
@ApiModel
(
value
=
"GoblinNtfOrderRefundCallbackParam"
,
description
=
"退款回调所需参数"
)
@Data
public
class
GoblinNtfOrderRefundCallbackParam
implements
Serializable
{
@ApiModelProperty
(
value
=
"状态 1成功 0失败"
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"退款金额"
)
private
BigDecimal
refundPrice
;
@ApiModelProperty
(
value
=
"PAY"
)
private
String
refundCode
;
@ApiModelProperty
(
value
=
"业务方自己生成的退款标识 比如订单ID加000"
)
private
String
orderRefundCode
;
@ApiModelProperty
(
value
=
"refundId"
)
private
String
refundId
;
@ApiModelProperty
(
value
=
"refundType"
)
private
String
refundType
;
@ApiModelProperty
(
value
=
"退款时间"
)
private
String
refundAt
;
@ApiModelProperty
(
value
=
"退款失败错误信息"
)
private
String
refundError
;
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftOrderService.java
View file @
7c02bbe6
package
com
.
liquidnet
.
service
.
goblin
.
service
;
package
com
.
liquidnet
.
service
.
goblin
.
service
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNtfPayResultVo
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderPayAgainParam
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderPayCallbackParam
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderPayParam
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderRefundCallbackParam
;
/**
/**
* <p>
* <p>
* NFT订单表 服务类
* NFT订单表 服务类
...
@@ -9,5 +16,13 @@ package com.liquidnet.service.goblin.service;
...
@@ -9,5 +16,13 @@ package com.liquidnet.service.goblin.service;
* @since 2022-03-23
* @since 2022-03-23
*/
*/
public
interface
IGoblinNftOrderService
{
public
interface
IGoblinNftOrderService
{
ResponseDto
<
GoblinNtfPayResultVo
>
checkOrder
(
GoblinNtfOrderPayParam
param
,
String
uid
);
ResponseDto
<
GoblinNtfPayResultVo
>
payAgain
(
GoblinNtfOrderPayAgainParam
param
);
ResponseDto
<
Integer
>
checkOrderResult
(
String
orderId
);
String
syncOrder
(
GoblinNtfOrderPayCallbackParam
syncOrderParam
);
String
refundSyncOrder
(
GoblinNtfOrderRefundCallbackParam
refundCallbackParam
);
}
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftOrderRefundServiceImpl.java
deleted
100644 → 0
View file @
c0a15062
package
com
.
liquidnet
.
service
.
goblin
.
service
.
impl
;
import
com.liquidnet.service.goblin.service.IGoblinNftOrderRefundService
;
import
org.springframework.stereotype.Service
;
/**
* <p>
* NFT订单退款表 服务实现类
* </p>
*
* @author jiangxiulong
* @since 2022-03-23
*/
@Service
public
class
GoblinNftOrderRefundServiceImpl
implements
IGoblinNftOrderRefundService
{
}
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftOrderServiceImpl.java
deleted
100644 → 0
View file @
c0a15062
package
com
.
liquidnet
.
service
.
goblin
.
service
.
impl
;
import
com.liquidnet.service.goblin.service.IGoblinNftOrderService
;
import
org.springframework.stereotype.Service
;
/**
* <p>
* NFT订单表 服务实现类
* </p>
*
* @author jiangxiulong
* @since 2022-03-23
*/
@Service
public
class
GoblinNftOrderServiceImpl
implements
IGoblinNftOrderService
{
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/GoblinNftOrderController.java
0 → 100644
View file @
7c02bbe6
package
com
.
liquidnet
.
service
.
order
.
controller
;
import
com.liquidnet.commons.lang.util.CurrentUtil
;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.codec.vo.EncryptedReq
;
import
com.liquidnet.service.goblin.dto.vo.GoblinNtfPayResultVo
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderPayAgainParam
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderPayCallbackParam
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderPayParam
;
import
com.liquidnet.service.goblin.param.GoblinNtfOrderRefundCallbackParam
;
import
com.liquidnet.service.goblin.service.IGoblinNftOrderService
;
import
io.swagger.annotations.*
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
javax.validation.Valid
;
@Api
(
tags
=
"NFT-支付相关"
)
@RestController
@RequestMapping
(
"/goblin/nft"
)
public
class
GoblinNftOrderController
{
@Autowired
IGoblinNftOrderService
iGoblinNftOrderService
;
@PostMapping
(
"pre"
)
@ApiOperation
(
"下单(加密)"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
GoblinNtfPayResultVo
>
checkOrder
(
@RequestBody
EncryptedReq
<
GoblinNtfOrderPayParam
>
param
)
{
GoblinNtfOrderPayParam
payOrderParam
=
param
.
getData
();
String
uid
=
CurrentUtil
.
getCurrentUid
();
return
iGoblinNftOrderService
.
checkOrder
(
payOrderParam
,
uid
);
}
@PostMapping
(
"fc7bce6d6c2213b866f76493f92224b8"
)
@ApiOperation
(
"下单(非加密)"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
GoblinNtfPayResultVo
>
checkOrder
(
@RequestBody
GoblinNtfOrderPayParam
param
)
{
String
uid
=
CurrentUtil
.
getCurrentUid
();
return
iGoblinNftOrderService
.
checkOrder
(
param
,
uid
);
}
@PostMapping
(
"payAgain"
)
@ApiOperation
(
"再次支付"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
ResponseDto
<
GoblinNtfPayResultVo
>
payAgain
(
@RequestBody
@Valid
GoblinNtfOrderPayAgainParam
param
)
{
return
iGoblinNftOrderService
.
payAgain
(
param
);
}
@PostMapping
(
"checkPayment"
)
@ApiOperation
(
"订单状态"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
type
=
"form"
,
required
=
true
,
dataType
=
"String"
,
name
=
"orderId"
,
value
=
"订单id"
,
example
=
"1"
),
})
public
ResponseDto
<
Integer
>
checkOrderResult
(
@RequestParam
(
"orderId"
)
@Valid
String
orderId
)
{
return
iGoblinNftOrderService
.
checkOrderResult
(
orderId
);
}
@PostMapping
(
"syncOrder"
)
@ApiOperation
(
"支付回调"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
String
syncOrder
(
@ModelAttribute
@Valid
GoblinNtfOrderPayCallbackParam
syncOrderParam
)
{
return
iGoblinNftOrderService
.
syncOrder
(
syncOrderParam
);
}
@ApiOperation
(
value
=
"退款回调"
)
@PostMapping
(
value
=
"refundSyncOrder"
)
@ApiResponse
(
code
=
200
,
message
=
"接口返回对象参数"
)
public
String
refundSyncOrder
(
GoblinNtfOrderRefundCallbackParam
refundCallbackParam
)
{
return
iGoblinNftOrderService
.
refundSyncOrder
(
refundCallbackParam
);
}
}
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java
0 → 100644
View file @
7c02bbe6
This diff is collapsed.
Click to expand it.
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinNtfOrderUtils.java
0 → 100644
View file @
7c02bbe6
This diff is collapsed.
Click to expand it.
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