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:45:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
67083a6b268d89f2f230b89285e2ae1b33bb0f65
67083a6b
1 parent
0a3039f8
refactor(settlement): improve settlement order detail processing logic
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
View file @
67083a6
...
...
@@ -873,9 +873,13 @@ public class SettlementServiceImpl implements SettlementService {
// 1. 先处理加餐
if
(
addOriginalDetailMap
.
containsKey
(
orderDetail
.
getId
())
&&
addOriginalDetailMap
.
get
(
orderDetail
.
getId
()).
getCount
()
!=
orderDetail
.
getCount
())
{
SettlementDTO
.
SettlementOrderDetail
addRecord
=
buildSettlementOrderDetail
(
final
var
orderDetailBO
=
addOriginalDetailMap
.
get
(
orderDetail
.
getId
());
SettlementDTO
.
SettlementOrderDetail
beforeChange
=
buildSettlementOrderDetail
(
order
,
orderDetail
.
getMenuDetailId
(),
orderDetail
.
getSkuId
(),
orderDetailBO
.
getCount
(),
orderDetail
.
getPrice
(),
"加餐"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
classifyOrders
.
add
(
beforeChange
);
SettlementDTO
.
SettlementOrderDetail
afterChange
=
buildSettlementOrderDetail
(
order
,
orderDetail
.
getMenuDetailId
(),
orderDetail
.
getSkuId
(),
orderDetail
.
getCount
(),
orderDetail
.
getPrice
(),
"加餐"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
classifyOrders
.
add
(
a
ddRecord
);
classifyOrders
.
add
(
a
fterChange
);
}
// 2. 再处理换菜
...
...
@@ -885,7 +889,6 @@ public class SettlementServiceImpl implements SettlementService {
SettlementDTO
.
SettlementOrderDetail
beforeChange
=
buildSettlementOrderDetail
(
order
,
orderDetail
.
getMenuDetailId
(),
orderDetailBO
.
getSkuId
(),
orderDetailBO
.
getCount
(),
orderDetailBO
.
getPrice
(),
"换菜前"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
classifyOrders
.
add
(
beforeChange
);
SettlementDTO
.
SettlementOrderDetail
afterChange
=
buildSettlementOrderDetail
(
order
,
orderDetail
.
getMenuDetailId
(),
orderDetail
.
getSkuId
(),
orderDetail
.
getCount
(),
orderDetail
.
getPrice
(),
"换菜后"
,
menuName
,
customerName
,
hisCustomerNo
,
menuDetailMap
,
mealMap
,
skuMap
);
classifyOrders
.
add
(
afterChange
);
...
...
@@ -893,9 +896,12 @@ public class SettlementServiceImpl implements SettlementService {
// 3. 判断已退款
if
(
orderDetail
.
getServeStatus
()
==
ServeStatusEnum
.
SERVE_REJECT
)
{
SettlementDTO
.
SettlementOrderDetail
refundRecord
=
buildSettlementOrderDetail
(
SettlementDTO
.
SettlementOrderDetail
refundRecord1
=
buildSettlementOrderDetail
(
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
);
classifyOrders
.
add
(
refundRecord
);
classifyOrders
.
add
(
refundRecord
2
);
}
// 4. 如果既不是加餐,也不是换菜,也不是退款,才记录“订餐”
...
...
Please
register
or
login
to post a comment