Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-api-boot-master
Commits
f6c0e14e
Commit
f6c0e14e
authored
Dec 03, 2024
by
yanghao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: #945 生产环境-A2405182NG ,这个订单收费数据没有取0.5倍数。 这个问题原因是退仓后没有置空上一次打包数据导致。 同时添加在确认可出时也将其置空。
parent
e2f10366
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
OrderServiceImpl.java
...dao/module/order/service/order/impl/OrderServiceImpl.java
+6
-1
OrderWarehouseInServiceImpl.java
...service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
+12
-0
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java
View file @
f6c0e14e
...
...
@@ -6493,7 +6493,12 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
@Override
public
void
airCan
(
Long
orderId
)
{
orderBusinessService
.
addOrderOperateLog
(
orderId
,
"确认可出"
,
null
);
orderMapper
.
update
(
null
,
new
LambdaUpdateWrapper
<
OrderDO
>().
set
(
OrderDO:
:
getAirShipment
,
2
).
eq
(
OrderDO:
:
getOrderId
,
orderId
));
orderMapper
.
update
(
null
,
new
LambdaUpdateWrapper
<
OrderDO
>()
.
set
(
OrderDO:
:
getAirShipment
,
2
).
set
(
OrderDO:
:
getSumVolumePrevPacked
,
null
)
.
set
(
OrderDO:
:
getSumWeightPrevPacked
,
null
)
.
set
(
OrderDO:
:
getSumCartonsNumPrevPacked
,
null
)
.
set
(
OrderDO:
:
getSumQuantityAllPrevPacked
,
null
)
.
eq
(
OrderDO:
:
getOrderId
,
orderId
));
}
@Override
...
...
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java
View file @
f6c0e14e
...
...
@@ -64,6 +64,7 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderLocation.OrderLocationD
import
cn.iocoder.yudao.module.order.dal.dataobject.orderSpecialNeed.OrderSpecialNeedDO
;
import
cn.iocoder.yudao.module.order.dal.dataobject.orderWarehouseApproval.OrderWarehouseApprovalDO
;
import
cn.iocoder.yudao.module.order.dal.dataobject.orderWarehouseIn.OrderWarehouseInDO
;
import
cn.iocoder.yudao.module.order.dal.mysql.order.OrderMapper
;
import
cn.iocoder.yudao.module.order.dal.mysql.orderWarehouseIn.OrderWarehouseInMapper
;
import
cn.iocoder.yudao.module.order.enums.*
;
import
cn.iocoder.yudao.module.order.service.order.*
;
...
...
@@ -181,6 +182,9 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
@Resource
@Lazy
private
OrderService
orderService
;
@Resource
private
OrderMapper
orderMapper
;
@Resource
@Lazy
private
OrderQueryService
orderQueryService
;
...
...
@@ -4511,6 +4515,14 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
orderLabelService
.
saveOrUpdateLabel
(
SaveOrUpdateOrderLabelDto
.
builder
().
orderId
(
orderId
).
orderLabelDtoList
(
labelDtoList
).
isAddLog
(
false
).
build
());
}
//退仓时 将订单的上一次打包数据更新为null
orderMapper
.
update
(
null
,
new
LambdaUpdateWrapper
<
OrderDO
>()
.
set
(
OrderDO:
:
getSumVolumePrevPacked
,
null
)
.
set
(
OrderDO:
:
getSumWeightPrevPacked
,
null
)
.
set
(
OrderDO:
:
getSumCartonsNumPrevPacked
,
null
)
.
set
(
OrderDO:
:
getSumQuantityAllPrevPacked
,
null
)
.
eq
(
OrderDO:
:
getOrderId
,
orderId
));
// 更新订单入仓信息
OrderWarehouseInVO
orderWarehouseInVO
=
new
OrderWarehouseInVO
();
orderWarehouseInVO
.
setOrderId
(
orderId
);
...
...
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