记得上下班打卡 | 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
75b9fa29
Commit
75b9fa29
authored
Jan 06, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dragon 平台 保存订单id
parent
1ee545a6
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
144 additions
and
79 deletions
+144
-79
GoblinPayInnerResultVo.java
...quidnet/service/goblin/dto/vo/GoblinPayInnerResultVo.java
+1
-1
GoblinOrderPreParam.java
...m/liquidnet/service/goblin/param/GoblinOrderPreParam.java
+48
-0
IGoblinAppOrderService.java
...uidnet/service/goblin/service/IGoblinAppOrderService.java
+1
-1
GoblinAppOrderController.java
...t/service/goblin/controller/GoblinAppOrderController.java
+1
-1
GoblinAppOrderServiceImpl.java
...ervice/goblin/service/impl/GoblinAppOrderServiceImpl.java
+93
-76
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/
manage/
vo/GoblinPayInnerResultVo.java
→
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinPayInnerResultVo.java
View file @
75b9fa29
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
manage
.
vo
;
package
com
.
liquidnet
.
service
.
goblin
.
dto
.
vo
;
import
lombok.Data
;
...
...
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinOrderPreParam.java
0 → 100644
View file @
75b9fa29
package
com
.
liquidnet
.
service
.
goblin
.
param
;
import
com.liquidnet.service.goblin.dto.vo.GoblinFrontGoodDetailVo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
@ApiModel
(
value
=
"GoblinOrderPreParam"
)
@Data
public
class
GoblinOrderPreParam
implements
Cloneable
{
@ApiModelProperty
(
required
=
false
,
value
=
"实际支付价格"
)
private
BigDecimal
priceActual
;
@ApiModelProperty
(
required
=
true
,
value
=
"商铺名称"
)
private
String
storeName
;
@ApiModelProperty
(
required
=
true
,
value
=
"sku名称"
)
private
String
skuName
;
@ApiModelProperty
(
required
=
true
,
value
=
"总订单号"
)
private
String
orderMasterCode
;
@ApiModelProperty
(
required
=
true
,
value
=
"订单id[逗号隔开]"
)
private
String
orderIdList
;
@ApiModelProperty
(
required
=
true
,
value
=
"订单过期时间"
)
private
int
expireTime
;
private
String
deviceFrom
;
private
String
payType
;
private
String
openId
;
private
String
returnUrl
;
private
String
showUrl
;
private
static
final
GoblinOrderPreParam
obj
=
new
GoblinOrderPreParam
();
public
static
GoblinOrderPreParam
getNew
()
{
try
{
return
(
GoblinOrderPreParam
)
obj
.
clone
();
}
catch
(
CloneNotSupportedException
e
)
{
return
new
GoblinOrderPreParam
();
}
}
}
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinAppOrderService.java
View file @
75b9fa29
...
...
@@ -2,7 +2,7 @@ package com.liquidnet.service.goblin.service;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.goblin.dto.manage.GoblinOrderParam
;
import
com.liquidnet.service.goblin.dto.
manage.
vo.GoblinPayInnerResultVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo
;
import
com.liquidnet.service.goblin.param.PayAgainParam
;
import
com.liquidnet.service.goblin.param.SyncOrderParam
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinAppOrderController.java
View file @
75b9fa29
...
...
@@ -3,7 +3,7 @@ package com.liquidnet.service.goblin.controller;
import
com.liquidnet.service.base.ResponseDto
;
import
com.liquidnet.service.base.codec.vo.EncryptedReq
;
import
com.liquidnet.service.goblin.dto.manage.GoblinOrderParam
;
import
com.liquidnet.service.goblin.dto.
manage.
vo.GoblinPayInnerResultVo
;
import
com.liquidnet.service.goblin.dto.vo.GoblinPayInnerResultVo
;
import
com.liquidnet.service.goblin.param.PayAgainParam
;
import
com.liquidnet.service.goblin.param.SyncOrderParam
;
import
com.liquidnet.service.goblin.service.IGoblinAppOrderService
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinAppOrderServiceImpl.java
View file @
75b9fa29
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