From fa4b399a1cfa43720b1f0a14fb3ca692a5ed1ea7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Aug 2022 17:44:53 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 8 ++------
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 8 ++------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
index 45b7724..6768de0 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -309,7 +309,7 @@
// return new FebsResponse().fail().message("订单不存在");
}
Integer status = mallOrderInfo.getStatus();
- if(OrderStatusEnum.WAIT_FINISH.getValue() != status){
+ if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
continue;
// return new FebsResponse().fail().message("订单不是待确认到货状态");
}
@@ -319,11 +319,7 @@
OrderStateDto orderStateDto = new OrderStateDto();
orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
- if(2 == mallOrderInfo.getIsHome()){
- orderStateDto.setOrderState("已送达自提点");
- }else{
- orderStateDto.setOrderState("已送达自提点");
- }
+ orderStateDto.setOrderState("已送达自提点");
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
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 638bca5..9c0ab56 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
@@ -138,7 +138,7 @@
// return new FebsResponse().fail().message("订单不存在");
}
Integer status = mallOrderInfo.getStatus();
- if(OrderStatusEnum.WAIT_FINISH.getValue() != status){
+ if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
continue;
// return new FebsResponse().fail().message("订单不是待确认到货状态");
}
@@ -148,11 +148,7 @@
OrderStateDto orderStateDto = new OrderStateDto();
orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
- if(2 == mallOrderInfo.getIsHome()){
- orderStateDto.setOrderState("已送达自提点");
- }else{
- orderStateDto.setOrderState("已送达自提点");
- }
+ orderStateDto.setOrderState("已送达自提点");
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
--
Gitblit v1.9.1