记得上下班打卡 | 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
6372d186
Commit
6372d186
authored
Mar 01, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单详情 增加逻辑是否可退款
增加拦截 sku退款
parent
2a8f6210
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
7 deletions
+33
-7
GoblinOrderAppServiceImpl.java
...ervice/goblin/service/impl/GoblinOrderAppServiceImpl.java
+7
-0
GoblinOrderServiceImpl.java
...t/service/goblin/service/impl/GoblinOrderServiceImpl.java
+1
-1
GoblinStoreOrderServiceImpl.java
...blin/service/impl/manage/GoblinStoreOrderServiceImpl.java
+10
-6
GoblinMongoUtils.java
...a/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
+15
-0
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderAppServiceImpl.java
View file @
6372d186
...
...
@@ -130,6 +130,13 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
if
(
orderRefundIds
.
size
()
>
0
)
{
GoblinBackOrderVo
backOrderVo
=
redisUtils
.
getBackOrderVo
(
orderRefundIds
.
get
(
orderRefundIds
.
size
()
-
1
));
vo
.
setRefundStatus
(
backOrderVo
.
getStatus
());
if
(
vo
.
getCanRefund
()==
1
&&
(
backOrderVo
.
getStatus
()==
2
||
backOrderVo
.
getStatus
()==
3
||
backOrderVo
.
getStatus
()==
5
)&&
(
vo
.
getStoreOrderVo
().
getStatus
()==
GoblinStatusConst
.
Status
.
ORDER_STATUS_2
.
getValue
()
||
vo
.
getStoreOrderVo
().
getStatus
()==
GoblinStatusConst
.
Status
.
ORDER_STATUS_4
.
getValue
())){
}
else
{
vo
.
setCanRefund
(
0
);
}
}
else
{
vo
.
setRefundStatus
(-
1
);
}
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinOrderServiceImpl.java
View file @
6372d186
...
...
@@ -876,7 +876,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
for
(
GoblinBackOrderSkuVo
backOrderSkuVo
:
backOrderSkuVos
)
{
GoblinOrderSkuVo
orderSkuVo
=
redisUtils
.
getGoblinOrderSkuVo
(
backOrderSkuVo
.
getOrderSkuId
());
orderSkuVo
.
setPriceRefund
(
orderSkuVo
.
getPriceRefund
()
==
null
?
price
:
orderSkuVo
.
getPriceRefund
().
add
(
price
));
if
(
orderSkuVo
.
getPriceRefund
().
compareTo
(
orderSkuVo
.
getSkuPriceActual
())
=
=
0
)
{
if
(
orderSkuVo
.
getPriceRefund
().
compareTo
(
orderSkuVo
.
getSkuPriceActual
())
>
=
0
)
{
orderSkuVo
.
setStatus
(
GoblinStatusConst
.
Status
.
ORDER_STATUS_6
.
getValue
());
String
pre
=
GoblinStatusConst
.
MarketPreStatus
.
getPre
(
orderSkuVo
.
getSkuId
());
String
skuId
=
orderSkuVo
.
getSkuId
();
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java
View file @
6372d186
...
...
@@ -195,11 +195,11 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
log
.
setRemark
(
"商铺取消订单"
);
//回退平台券
if
(!(
orderVo
.
getUcouponId
()
==
null
||
orderVo
.
getUcouponId
().
equals
(
""
)))
{
if
(!(
orderVo
.
getUcouponId
()
==
null
||
orderVo
.
getUcouponId
().
equals
(
""
)))
{
orderUtils
.
backCoupon
(
orderVo
.
getUcouponId
(),
orderVo
.
getUserId
());
}
//回退店铺券
if
(!(
orderVo
.
getStoreCouponId
()
==
null
||
orderVo
.
getStoreCouponId
().
equals
(
""
)))
{
if
(!(
orderVo
.
getStoreCouponId
()
==
null
||
orderVo
.
getStoreCouponId
().
equals
(
""
)))
{
List
<
BackCouponParam
>
params
=
ObjectUtil
.
getBackCouponParam
();
BackCouponParam
backCouponParam
=
BackCouponParam
.
getNew
();
backCouponParam
.
setuCouponIds
(
orderVo
.
getStoreCouponId
());
...
...
@@ -387,7 +387,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
if
(
orderVo
==
null
||
!
orderVo
.
getStoreId
().
equals
(
storeInfoVo
.
getStoreId
()))
{
return
ResponseDto
.
failure
(
"无法查看"
);
}
if
(
orderSkuId
!=
null
)
{
if
(
orderSkuId
!=
null
)
{
GoblinOrderSkuVo
orderSkuVo
=
redisUtils
.
getGoblinOrderSkuVo
(
orderSkuId
);
if
(
orderSkuVo
==
null
)
{
return
ResponseDto
.
failure
(
"不存在"
);
...
...
@@ -402,9 +402,13 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
backOrderSkuVo
.
setSkuSpecs
(
orderSkuVo
.
getSkuSpecs
());
backOrderSkuVo
.
setCreatedAt
(
nowStr
);
orderSkuVoList
.
add
(
backOrderSkuVo
);
}
else
{
BigDecimal
backOrderSkuVoPrice
=
mongoUtils
.
getRefundOrderSkuVoPrice
(
orderSkuId
);
if
(
price
.
compareTo
(
orderSkuVo
.
getSkuPriceActual
().
subtract
(
backOrderSkuVoPrice
))
>
0
)
{
return
ResponseDto
.
failure
(
"退款价格超过商品可退价格"
);
}
}
else
{
refundPrice
=
BigDecimal
.
ZERO
;
for
(
String
orderSkuIdItem:
orderVo
.
getOrderSkuVoIds
())
{
for
(
String
orderSkuIdItem
:
orderVo
.
getOrderSkuVoIds
())
{
GoblinOrderSkuVo
orderSkuVo
=
redisUtils
.
getGoblinOrderSkuVo
(
orderSkuIdItem
);
GoblinBackOrderSkuVo
backOrderSkuVo
=
GoblinBackOrderSkuVo
.
getNew
();
backOrderSkuVo
.
setOrderSkuId
(
orderSkuIdItem
);
...
...
@@ -416,7 +420,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
backOrderSkuVo
.
setSkuSpecs
(
orderSkuVo
.
getSkuSpecs
());
backOrderSkuVo
.
setCreatedAt
(
nowStr
);
orderSkuVoList
.
add
(
backOrderSkuVo
);
refundPrice
=
refundPrice
.
add
(
orderSkuVo
.
getSkuPriceActual
());
refundPrice
=
refundPrice
.
add
(
orderSkuVo
.
getSkuPriceActual
()
.
subtract
(
orderSkuVo
.
getPriceRefund
())
);
}
}
//记录退款单
...
...
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @
6372d186
...
...
@@ -49,6 +49,8 @@ public class GoblinMongoUtils {
MongoTemplate
mongoTemplate
;
@Autowired
MongoConverter
mongoConverter
;
@Autowired
GoblinRedisUtils
redisUtils
;
/* ---------------------------------------- 平台分类数据源 ---------------------------------------- */
...
...
@@ -1145,6 +1147,19 @@ public class GoblinMongoUtils {
}
//获取退款sku订单价格
public
BigDecimal
getRefundOrderSkuVoPrice
(
String
orderSkuId
)
{
BigDecimal
refundPrice
=
BigDecimal
.
ZERO
;
List
<
GoblinBackOrderVo
>
backOrderVos
=
mongoTemplate
.
find
(
Query
.
query
(
Criteria
.
where
(
"backOrderSkuVos.orderSkuId"
).
is
(
orderSkuId
).
and
(
"status"
).
in
(
3
,
5
,
9
)),
GoblinBackOrderVo
.
class
,
GoblinBackOrderVo
.
class
.
getSimpleName
());
for
(
GoblinBackOrderVo
vo
:
backOrderVos
)
{
for
(
GoblinBackOrderSkuVo
orderSkuVo
:
vo
.
getBackOrderSkuVos
())
{
refundPrice
=
refundPrice
.
add
(
orderSkuVo
.
getRefundPrice
());
}
}
return
refundPrice
;
}
;
/* ---------------------------------------- 商城:用户优惠券 ---------------------------------------- */
...
...
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