From 2cb2669a13dd6cd043f17b7a10a090110cbe674f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 11 Aug 2022 10:02:52 +0800
Subject: [PATCH] 20220810
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 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 d5f1fe2..022a097 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
@@ -5,6 +5,7 @@
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
+import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.conversion.MallOrderInfoConversion;
import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
import cc.mrbird.febs.mall.dto.*;
@@ -42,6 +43,13 @@
@Service
@RequiredArgsConstructor
public class ApiMallTeamLeaderServiceImpl extends ServiceImpl<MallTeamLeaderMapper, MallTeamLeader> implements IApiMallTeamLeaderService {
+
+
+ private final MallOrderInfoMapper mallOrderInfoMapper;
+ private final MallTeamLeaderMapper mallTeamLeaderMapper;
+ private final MallMemberMapper mallMemberMapper;
+ private final IXcxPayService iXcxPayService;
+ private final SpringContextHolder springContextHolder;
@Override
@Transactional
@@ -118,28 +126,23 @@
return MallOrderInfoConversion.INSTANCE.entitysToVos(mallOrderInfos.getRecords());
}
- private final MallOrderInfoMapper mallOrderInfoMapper;
- private final MallTeamLeaderMapper mallTeamLeaderMapper;
- private final MallMemberMapper mallMemberMapper;
- private final IXcxPayService iXcxPayService;
-
@Override
@Transactional
public FebsResponse leaderOrderConfirm(ApiLeaderOrderConfirmDto apiLeaderOrderConfirmDto) {
- String ids = apiLeaderOrderConfirmDto.getIds();
- if(StrUtil.isEmpty(ids)){
+ log.info("确认到达",apiLeaderOrderConfirmDto.getIds());
+ List<Long> ids = apiLeaderOrderConfirmDto.getIds();
+ if(CollUtil.isEmpty(ids)){
return new FebsResponse().fail().message("请选择订单");
}
- List<String> orderIds = StrUtil.splitTrim(ids, ",");
- for(String id : orderIds){
- long orderId = Long.parseLong(id);
+ for(Long orderId : ids){
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){
+ 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("订单不是待确认到货状态");
}
@@ -148,12 +151,9 @@
OrderStateDto orderStateDto = new OrderStateDto();
orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
- orderStateDto.setGoodsName(getProductNames(mallOrderInfo.getMemberId(),mallOrderInfo.getId()));
- if(2 == mallOrderInfo.getIsHome()){
- orderStateDto.setOrderState("已送达自提点");
- }else{
- orderStateDto.setOrderState("已送达自提点");
- }
+ String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
+ orderStateDto.setGoodsName(StrUtil.isEmpty(productNames)?"商品":productNames);
+ orderStateDto.setOrderState("已送达自提点");
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
--
Gitblit v1.9.1