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
fae2d6e2
Commit
fae2d6e2
authored
Jan 21, 2025
by
honghy
Committed by
wux
Jan 21, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug221 KG2500009N-测试环境-撤销提货,订单状态无修改
parent
dfb8660a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
OrderPickupServiceImpl.java
...ule/order/service/orderPickup/OrderPickupServiceImpl.java
+5
-5
No files found.
yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderPickup/OrderPickupServiceImpl.java
View file @
fae2d6e2
...
@@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
...
@@ -4,8 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import
cn.iocoder.yudao.framework.common.pojo.PageResult
;
import
cn.iocoder.yudao.framework.common.pojo.PageResult
;
import
cn.iocoder.yudao.framework.common.util.collection.ArrayUtils
;
import
cn.iocoder.yudao.framework.common.util.collection.ArrayUtils
;
import
cn.iocoder.yudao.framework.common.util.date.DateUtils
;
import
cn.iocoder.yudao.framework.common.util.date.DateUtils
;
import
cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO
;
import
cn.iocoder.yudao.framework.dict.core.util.DictFrameworkUtils
;
import
cn.iocoder.yudao.framework.i18n.core.I18nMessage
;
import
cn.iocoder.yudao.framework.i18n.core.I18nMessage
;
import
cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX
;
import
cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX
;
import
cn.iocoder.yudao.framework.mybatis.core.service.AbstractService
;
import
cn.iocoder.yudao.framework.mybatis.core.service.AbstractService
;
...
@@ -23,11 +21,13 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderTime.OrderTimeDO;
...
@@ -23,11 +21,13 @@ import cn.iocoder.yudao.module.order.dal.dataobject.orderTime.OrderTimeDO;
import
cn.iocoder.yudao.module.order.dal.mysql.orderPickup.OrderPickupMapper
;
import
cn.iocoder.yudao.module.order.dal.mysql.orderPickup.OrderPickupMapper
;
import
cn.iocoder.yudao.module.order.dto.OrderBackInfoDto
;
import
cn.iocoder.yudao.module.order.dto.OrderBackInfoDto
;
import
cn.iocoder.yudao.module.order.enums.*
;
import
cn.iocoder.yudao.module.order.enums.*
;
import
cn.iocoder.yudao.module.order.service.order.*
;
import
cn.iocoder.yudao.module.order.service.order.OrderBusinessService
;
import
cn.iocoder.yudao.module.order.service.order.OrderQueryService
;
import
cn.iocoder.yudao.module.order.service.order.OrderService
;
import
cn.iocoder.yudao.module.order.service.order.OrderTimeService
;
import
cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoControlPickService
;
import
cn.iocoder.yudao.module.order.service.orderCargoControlPick.OrderCargoControlPickService
;
import
cn.iocoder.yudao.module.order.vo.orderConsignee.OrderConsigneeBackVO
;
import
cn.iocoder.yudao.module.order.vo.orderConsignee.OrderConsigneeBackVO
;
import
cn.iocoder.yudao.module.order.vo.orderPickup.*
;
import
cn.iocoder.yudao.module.order.vo.orderPickup.*
;
import
cn.iocoder.yudao.module.order.vo.orderTime.OrderTimeQueryVO
;
import
cn.iocoder.yudao.module.system.service.user.AdminUserService
;
import
cn.iocoder.yudao.module.system.service.user.AdminUserService
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
...
@@ -346,7 +346,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
...
@@ -346,7 +346,7 @@ public class OrderPickupServiceImpl extends AbstractService<OrderPickupMapper, O
OrderPickupDO
delOrderPickupDO
=
orderPickupMapper
.
selectDeletedPickup
(
orderPickupDO
.
getOrderId
());
OrderPickupDO
delOrderPickupDO
=
orderPickupMapper
.
selectDeletedPickup
(
orderPickupDO
.
getOrderId
());
// 这里需要考虑到老数据的空指针异常
// 这里需要考虑到老数据的空指针异常
// orderService.updateStatus(one.getOrderId(), null, Objects.nonNull(delOrderPickupDO) ? delOrderPickupDO.getOrderStatus() : 16, null, null, null, null, null);
// orderService.updateStatus(one.getOrderId(), null, Objects.nonNull(delOrderPickupDO) ? delOrderPickupDO.getOrderStatus() : 16, null, null, null, null, null);
dealDeliveryRate
(
one
.
getOrderNo
(),
one
.
getSumNum
(),
PickStateEnum
.
picked
.
getPickState
());
dealDeliveryRate
(
one
.
getOrderNo
(),
one
.
getSumNum
(),
PickStateEnum
.
unpick
.
getPickState
());
}
}
if
(
Objects
.
equals
(
one
.
getTransportId
(),
TransportTypeShortEnum
.
AIR_FREIGHT_LINE
.
getValue
()))
{
if
(
Objects
.
equals
(
one
.
getTransportId
(),
TransportTypeShortEnum
.
AIR_FREIGHT_LINE
.
getValue
()))
{
...
...
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