Toggle navigation
Toggle navigation
This project
Loading...
Sign in
jiujian
/
client-customer-order-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhuyifan
2025-11-18 09:52:36 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f27c89a2e784ecc0b3f58360f24d10b093be8d19
f27c89a2
1 parent
5765f32d
refactor(settlement): improve settlement order detail processing logic
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
View file @
f27c89a
...
...
@@ -897,10 +897,10 @@ public class SettlementServiceImpl implements SettlementService {
// 3. 判断已退款
if
(
orderDetail
.
getServeStatus
()
==
ServeStatusEnum
.
SERVE_REJECT
)
{
SettlementDTO
.
SettlementOrderDetail
refundRecord1
=
buildSettlementOrderDetail
(
order
,
orderDetail
.
getMenuDetailId
(),
orderDetail
.
getSkuId
(),
-
orderDetail
.
getCount
(),
orderDetail
.
getPrice
(),
"已退款
"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
order
,
orderDetail
.
getMenuDetailId
(),
orderDetail
.
getSkuId
(),
orderDetail
.
getCount
(),
orderDetail
.
getPrice
(),
"订餐
"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
classifyOrders
.
add
(
refundRecord1
);
SettlementDTO
.
SettlementOrderDetail
refundRecord2
=
buildSettlementOrderDetail
(
order
,
orderDetail
.
getMenuDetailId
(),
orderDetail
.
getSkuId
(),
orderDetail
.
getCount
(),
orderDetail
.
getPrice
(),
"已退款"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
order
,
orderDetail
.
getMenuDetailId
(),
orderDetail
.
getSkuId
(),
-
orderDetail
.
getCount
(),
orderDetail
.
getPrice
(),
"已退款"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
classifyOrders
.
add
(
refundRecord2
);
}
...
...
@@ -970,7 +970,7 @@ public class SettlementServiceImpl implements SettlementService {
.
avoidRemark
(
order
.
getAvoidRemark
())
.
onlinePay
(
onlinePayDesc
)
.
operationType
(
operationType
)
.
transactionId
(
order
.
getTransactionId
())
.
transactionId
(
o
perationType
.
equals
(
"已退款"
)
?
""
:
o
rder
.
getTransactionId
())
.
build
();
}
...
...
Please
register
or
login
to post a comment