From f963d21065247edc1c5e9aad7a23e66d80d441ab Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Aug 2022 16:02:13 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 78fad81..19a12ee 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -129,19 +129,21 @@
@Override
@Transactional
public FebsResponse leaderOrderConfirm(ApiLeaderOrderConfirmDto apiLeaderOrderConfirmDto) {
- log.info("确认到达",apiLeaderOrderConfirmDto.getIds());
- List<Long> ids = apiLeaderOrderConfirmDto.getIds();
- if(CollUtil.isEmpty(ids)){
+ log.info("确认到达"+apiLeaderOrderConfirmDto.getIds());
+ List<String> idsStr = StrUtil.splitTrim(apiLeaderOrderConfirmDto.getIds(),",");
+ if(CollUtil.isEmpty(idsStr)){
return new FebsResponse().fail().message("请选择订单");
}
- for(Long orderId : ids){
+ for(String orderIdStr : idsStr){
+ long orderId = Long.parseLong(orderIdStr);
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
if(ObjectUtil.isEmpty(mallOrderInfo)){
continue;
// return new FebsResponse().fail().message("订单不存在");
}
- Integer status = mallOrderInfo.getStatus();
- if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
+ Integer status = mallOrderInfo.getStatus() == null ? 0 : mallOrderInfo.getStatus();
+ Integer deliveryState = mallOrderInfo.getDeliveryState() == null ? 0 : mallOrderInfo.getDeliveryState();
+ if(OrderStatusEnum.WAIT_FINISH.getValue() != status || 2 != deliveryState){
continue;
// return new FebsResponse().fail().message("订单不是待确认到货状态");
}
--
Gitblit v1.9.1