Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
cb2acf14
Commit
cb2acf14
authored
Sep 10, 2024
by
shiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
换藏订单取消后,订单快照设置为无效
parent
8c2d2863
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
0 deletions
+18
-0
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java
...ch/wx/impl/distribution/DistributionOrderServiceImpl.java
+18
-0
No files found.
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java
View file @
cb2acf14
...
@@ -786,12 +786,20 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
...
@@ -786,12 +786,20 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
int
updateStock
=
currentStock
+
exchangeOrderSnapshot
.
getItemNum
();
int
updateStock
=
currentStock
+
exchangeOrderSnapshot
.
getItemNum
();
supplierItemDao
.
updateStock
(
exchangeOrderSnapshot
.
getItemId
(),
updateStock
);
supplierItemDao
.
updateStock
(
exchangeOrderSnapshot
.
getItemId
(),
updateStock
);
}
}
//订单快照设置为无效
ExchangeOrderSnapshot
exchangeOrderSnapshot
=
new
ExchangeOrderSnapshot
();
exchangeOrderSnapshot
.
setDistributionOrderId
(
dto
.
getDistributionOrderId
());
exchangeOrderSnapshot
.
setIsValid
(
false
);
exchangeOrderSnapshotDao
.
update
(
exchangeOrderSnapshot
);
}
else
{
}
else
{
if
(
distributionOrder
.
getState
()
!=
DistributionEnum
.
DistributionOrderStateEnum
.
PRE_PAY
.
getCode
())
{
if
(
distributionOrder
.
getState
()
!=
DistributionEnum
.
DistributionOrderStateEnum
.
PRE_PAY
.
getCode
())
{
return
Result
.
failed
(
"该订单不是待支付状态,无法直接取消"
);
return
Result
.
failed
(
"该订单不是待支付状态,无法直接取消"
);
}
}
distributionOrderDao
.
updateState
(
dto
.
getDistributionOrderId
(),
DistributionEnum
.
DistributionOrderStateEnum
.
CANCEL
.
getCode
());
distributionOrderDao
.
updateState
(
dto
.
getDistributionOrderId
(),
DistributionEnum
.
DistributionOrderStateEnum
.
CANCEL
.
getCode
());
distributorProfitDao
.
updateValidState
(
dto
.
getDistributionOrderId
(),
false
);
distributorProfitDao
.
updateValidState
(
dto
.
getDistributionOrderId
(),
false
);
}
}
return
Result
.
success
();
return
Result
.
success
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -1329,6 +1337,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
...
@@ -1329,6 +1337,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
if
(
distributionOrder
.
getType
().
intValue
()
==
DistributionEnum
.
DistributionTypeEnum
.
EXCHANGE
.
getCode
())
{
if
(
distributionOrder
.
getType
().
intValue
()
==
DistributionEnum
.
DistributionTypeEnum
.
EXCHANGE
.
getCode
())
{
SupplierItem
supplierItem
=
supplierItemDao
.
findById
(
distributionOrder
.
getItemId
());
SupplierItem
supplierItem
=
supplierItemDao
.
findById
(
distributionOrder
.
getItemId
());
supplierItemDao
.
updateStock
(
distributionOrder
.
getItemId
(),
supplierItem
.
getStock
()
+
distributionOrder
.
getItemNum
());
supplierItemDao
.
updateStock
(
distributionOrder
.
getItemId
(),
supplierItem
.
getStock
()
+
distributionOrder
.
getItemNum
());
//订单快照设置为无效
ExchangeOrderSnapshot
exchangeOrderSnapshot
=
new
ExchangeOrderSnapshot
();
exchangeOrderSnapshot
.
setDistributionOrderId
(
distributionOrderId
);
exchangeOrderSnapshot
.
setIsValid
(
false
);
exchangeOrderSnapshotDao
.
update
(
exchangeOrderSnapshot
);
}
}
}
}
}
}
...
@@ -1365,6 +1378,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
...
@@ -1365,6 +1378,11 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
if
(
distributionOrder
.
getType
().
intValue
()
==
DistributionEnum
.
DistributionTypeEnum
.
EXCHANGE
.
getCode
())
{
if
(
distributionOrder
.
getType
().
intValue
()
==
DistributionEnum
.
DistributionTypeEnum
.
EXCHANGE
.
getCode
())
{
SupplierItem
supplierItem
=
supplierItemDao
.
findById
(
distributionOrder
.
getItemId
());
SupplierItem
supplierItem
=
supplierItemDao
.
findById
(
distributionOrder
.
getItemId
());
supplierItemDao
.
updateStock
(
distributionOrder
.
getItemId
(),
supplierItem
.
getStock
()
+
distributionOrder
.
getItemNum
());
supplierItemDao
.
updateStock
(
distributionOrder
.
getItemId
(),
supplierItem
.
getStock
()
+
distributionOrder
.
getItemNum
());
//订单快照设置为无效
ExchangeOrderSnapshot
exchangeOrderSnapshot
=
new
ExchangeOrderSnapshot
();
exchangeOrderSnapshot
.
setDistributionOrderId
(
distributionOrder
.
getDistributionOrderId
());
exchangeOrderSnapshot
.
setIsValid
(
false
);
exchangeOrderSnapshotDao
.
update
(
exchangeOrderSnapshot
);
}
}
}
}
}
}
...
...
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