From 72c995726194612b74566a9a3fb6f536a8eb79d0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Aug 2022 18:29:18 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 94cfbbc..a3e1ece 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallOrderController.java
@@ -59,6 +59,10 @@
private final MallOrderInfoMapper mallOrderInfoMapper;
private final SpringContextHolder springContextHolder;
+ private final IXcxPayService iXcxPayService;
+ private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final MallMemberMapper mallMemberMapper;
+
/**
* 订单列表
*
@@ -294,12 +298,8 @@
return null;
}
- private final IXcxPayService iXcxPayService;
- private final MallTeamLeaderMapper mallTeamLeaderMapper;
- private final MallMemberMapper mallMemberMapper;
-
@GetMapping("confirmOrder")
- @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "确认货到达自提点")
+ @ControllerEndpoint(operation = "确认货到达自提点", exceptionMessage = "操作失败")
public FebsResponse confirmOrder(MallOrderInfo mallOrderInfoDto){
String orderIds = mallOrderInfoDto.getOrderIds();
List<String> ids = StrUtil.splitTrim(orderIds, ",");
@@ -310,8 +310,9 @@
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("订单不是待确认到货状态");
}
@@ -330,7 +331,7 @@
orderStateDto.setTemplateId(WechatConfigure.WX_ORDER_STATEMSG_TEMPLATE_ID);
iXcxPayService.pushOrderToAddress(orderStateDto);
}
- return new FebsResponse().success().message("确认成功");
+ return new FebsResponse().success();
}
/**
--
Gitblit v1.9.1