Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
51d39cfb
提交
51d39cfb
authored
10月 31, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
优化相关代码
上级
21f100d7
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
31 行增加
和
25 行删除
+31
-25
OrderCancelServiceImpl.java
.../clx/performance/service/impl/OrderCancelServiceImpl.java
+31
-25
没有找到文件。
performance-web/src/main/java/com/clx/performance/service/impl/OrderCancelServiceImpl.java
浏览文件 @
51d39cfb
...
@@ -337,12 +337,14 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -337,12 +337,14 @@ public class OrderCancelServiceImpl implements OrderCancelService {
throw
new
RuntimeException
(
"货主取消订单失败,原因:远程调用取消订单失败"
);
throw
new
RuntimeException
(
"货主取消订单失败,原因:远程调用取消订单失败"
);
}
}
for
(
OrderGoods
orderGoods
:
orderGoodsList
)
{
// for (OrderGoods orderGoods : orderGoodsList) {
OrderGoods
update
=
new
OrderGoods
();
// OrderGoods update = new OrderGoods();
update
.
setId
(
orderGoods
.
getId
());
// update.setId(orderGoods.getId());
update
.
setOrderGoodsStatus
(
OrderGoodsStatusEnum
.
Status
.
CANCEL
.
getCode
());
// update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
orderGoodsDao
.
updateEntityByKey
(
update
);
// orderGoodsDao.updateEntityByKey(update);
}
// }
orderGoodsDao
.
batchUpdateOrderGoodsStatus
(
OrderGoodsStatusEnum
.
Status
.
CANCEL
.
getCode
(),
orderGoodsList
.
stream
().
map
(
OrderGoods:
:
getId
).
collect
(
Collectors
.
toList
()))
}
else
{
}
else
{
...
@@ -439,19 +441,21 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -439,19 +441,21 @@ public class OrderCancelServiceImpl implements OrderCancelService {
}
else
if
(
OrderEnum
.
Status
.
CANCELED
.
getCode
().
equals
(
orderInfoFeignVO
.
getOrderStatus
()))
{
}
else
if
(
OrderEnum
.
Status
.
CANCELED
.
getCode
().
equals
(
orderInfoFeignVO
.
getOrderStatus
()))
{
//已取消
//已取消
// for (OrderGoods orderGoods : orderGoodsList) {
List
<
Integer
>
ids
=
new
LinkedList
<>();
// truckDemandMap.put(orderGoods.getTruckDemand(),
for
(
OrderGoods
orderGoods
:
orderGoodsList
)
{
// truckDemandMap.get(orderGoods.getTruckDemand())
truckDemandMap
.
put
(
orderGoods
.
getTruckDemand
(),
// .add(orderGoods.getResidueTransportWeight()));
truckDemandMap
.
get
(
orderGoods
.
getTruckDemand
())
//// OrderGoods update = new OrderGoods();
.
add
(
orderGoods
.
getResidueTransportWeight
()));
//// update.setId(orderGoods.getId());
ids
.
add
(
orderGoods
.
getId
());
//// //TODO 补充批量更新接口 关闭货单状态
// OrderGoods update = new OrderGoods();
//// update.setResidueTransportWeight(BigDecimal.ZERO);
// update.setId(orderGoods.getId());
//
// //TODO 补充批量更新接口 关闭货单状态
//// update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
// update.setResidueTransportWeight(BigDecimal.ZERO);
// orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, BigDecimal.ZERO, orderGoods.getId());
// }
// update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
orderGoodsDao
.
batchUpdateOrderGoodsWeight
(
BigDecimal
.
ZERO
,
orderGoodsList
.
stream
().
map
(
OrderGoods:
:
getId
).
collect
(
Collectors
.
toList
()));
// orderGoodsDao.updateOrderGoodsSetResidueWeightAndAlreadyWeight(BigDecimal.ZERO, BigDecimal.ZERO, orderGoods.getId());
}
orderGoodsDao
.
batchUpdateOrderGoodsWeight
(
BigDecimal
.
ZERO
,
ids
);
}
}
...
@@ -520,18 +524,20 @@ public class OrderCancelServiceImpl implements OrderCancelService {
...
@@ -520,18 +524,20 @@ public class OrderCancelServiceImpl implements OrderCancelService {
}
else
if
(
OrderEnum
.
Status
.
CANCELED
.
getCode
().
equals
(
orderInfoFeignVO
.
getOrderStatus
()))
{
}
else
if
(
OrderEnum
.
Status
.
CANCELED
.
getCode
().
equals
(
orderInfoFeignVO
.
getOrderStatus
()))
{
//已取消
//已取消
// for (OrderGoods orderGoods : orderGoodsList) {
List
<
Integer
>
ids
=
new
LinkedList
<>();
// vehicleUsageMap.put(orderGoods.getVehicleUsage(),
for
(
OrderGoods
orderGoods
:
orderGoodsList
)
{
// vehicleUsageMap.get(orderGoods.getVehicleUsage())
vehicleUsageMap
.
put
(
orderGoods
.
getVehicleUsage
(),
// .add(orderGoods.getResidueTransportWeight()));
vehicleUsageMap
.
get
(
orderGoods
.
getVehicleUsage
())
.
add
(
orderGoods
.
getResidueTransportWeight
()));
ids
.
add
(
orderGoods
.
getId
());
// OrderGoods update = new OrderGoods();
// OrderGoods update = new OrderGoods();
// update.setId(orderGoods.getId());
// update.setId(orderGoods.getId());
// //TODO 补充批量更新接口 关闭货单状态
// //TODO 补充批量更新接口 关闭货单状态
// update.setResidueTransportWeight(BigDecimal.ZERO);
// update.setResidueTransportWeight(BigDecimal.ZERO);
// //update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
// //update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.COMPLETED.getCode());
// orderGoodsDao.updateEntityByKey(update);
// orderGoodsDao.updateEntityByKey(update);
//
}
}
orderGoodsDao
.
batchUpdateOrderGoodsWeight
(
BigDecimal
.
ZERO
,
orderGoodsList
.
stream
().
map
(
OrderGoods:
:
getId
).
collect
(
Collectors
.
toList
())
);
orderGoodsDao
.
batchUpdateOrderGoodsWeight
(
BigDecimal
.
ZERO
,
ids
);
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论