记得上下班打卡 | 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
e23487b0
Commit
e23487b0
authored
Mar 04, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 订单详情bug
parent
d7b6f79a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
GoblinStoreOrderListVo.java
...quidnet/service/goblin/dto/vo/GoblinStoreOrderListVo.java
+5
-0
GoblinStoreOrderServiceImpl.java
...blin/service/impl/manage/GoblinStoreOrderServiceImpl.java
+4
-0
No files found.
liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderListVo.java
View file @
e23487b0
...
@@ -34,10 +34,15 @@ public class GoblinStoreOrderListVo implements Cloneable {
...
@@ -34,10 +34,15 @@ public class GoblinStoreOrderListVo implements Cloneable {
private
String
platformUcouponId
;
private
String
platformUcouponId
;
@ApiModelProperty
(
value
=
" 平台券名称"
)
@ApiModelProperty
(
value
=
" 平台券名称"
)
private
String
platformUcouponName
;
private
String
platformUcouponName
;
@ApiModelProperty
(
value
=
" 平台券价格"
)
private
BigDecimal
platformUcouponPrice
;
@ApiModelProperty
(
value
=
" 店铺券id"
)
@ApiModelProperty
(
value
=
" 店铺券id"
)
private
String
storeUcouponId
;
private
String
storeUcouponId
;
@ApiModelProperty
(
value
=
" 店铺券名称"
)
@ApiModelProperty
(
value
=
" 店铺券名称"
)
private
String
storeUcouponName
;
private
String
storeUcouponName
;
@ApiModelProperty
(
value
=
" 店铺券价格"
)
private
BigDecimal
storeUcouponPrice
;
@ApiModelProperty
(
value
=
" 付款金额"
)
@ApiModelProperty
(
value
=
" 付款金额"
)
private
BigDecimal
priceActual
;
private
BigDecimal
priceActual
;
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java
View file @
e23487b0
...
@@ -132,9 +132,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
...
@@ -132,9 +132,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
CandyCouponVo
candyCouponVo
=
orderUtils
.
getCouponDetails
(
orderVo
.
getUcouponId
());
CandyCouponVo
candyCouponVo
=
orderUtils
.
getCouponDetails
(
orderVo
.
getUcouponId
());
vo
.
setPlatformUcouponId
(
candyCouponVo
.
getUcouponId
());
vo
.
setPlatformUcouponId
(
candyCouponVo
.
getUcouponId
());
vo
.
setPlatformUcouponName
(
candyCouponVo
.
getTitle
());
vo
.
setPlatformUcouponName
(
candyCouponVo
.
getTitle
());
vo
.
setPlatformUcouponPrice
(
orderVo
.
getPriceCoupon
());
}
else
{
}
else
{
vo
.
setPlatformUcouponId
(
""
);
vo
.
setPlatformUcouponId
(
""
);
vo
.
setPlatformUcouponName
(
""
);
vo
.
setPlatformUcouponName
(
""
);
vo
.
setPlatformUcouponPrice
(
BigDecimal
.
ZERO
);
}
}
if
(!(
orderVo
.
getStoreCouponId
()
==
null
||
orderVo
.
getStoreCouponId
().
equals
(
""
)))
{
if
(!(
orderVo
.
getStoreCouponId
()
==
null
||
orderVo
.
getStoreCouponId
().
equals
(
""
)))
{
List
<
GoblinUserCouponVo
>
voList
=
redisUtils
.
getUserCouponVos
(
orderVo
.
getUserId
());
List
<
GoblinUserCouponVo
>
voList
=
redisUtils
.
getUserCouponVos
(
orderVo
.
getUserId
());
...
@@ -142,6 +144,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
...
@@ -142,6 +144,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
if
(
goblinUserCouponVo
.
getUcouponId
().
equals
(
orderVo
.
getStoreCouponId
()))
{
if
(
goblinUserCouponVo
.
getUcouponId
().
equals
(
orderVo
.
getStoreCouponId
()))
{
vo
.
setStoreUcouponId
(
goblinUserCouponVo
.
getStoreCouponId
());
vo
.
setStoreUcouponId
(
goblinUserCouponVo
.
getStoreCouponId
());
vo
.
setStoreUcouponName
(
goblinUserCouponVo
.
getTitle
());
vo
.
setStoreUcouponName
(
goblinUserCouponVo
.
getTitle
());
vo
.
setStoreUcouponPrice
(
orderVo
.
getStorePriceCoupon
());
break
;
break
;
}
}
}
}
...
@@ -149,6 +152,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
...
@@ -149,6 +152,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
}
else
{
}
else
{
vo
.
setStoreUcouponId
(
""
);
vo
.
setStoreUcouponId
(
""
);
vo
.
setStoreUcouponName
(
""
);
vo
.
setStoreUcouponName
(
""
);
vo
.
setStoreUcouponPrice
(
BigDecimal
.
ZERO
);
}
}
if
(
orderVo
.
getMarketId
()
==
null
||
orderVo
.
getMarketId
().
equals
(
""
))
{
if
(
orderVo
.
getMarketId
()
==
null
||
orderVo
.
getMarketId
().
equals
(
""
))
{
vo
.
setMarketName
(
""
);
vo
.
setMarketName
(
""
);
...
...
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