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 | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 edcce8a..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
@@ -34,7 +34,9 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Slf4j
@Service
@@ -124,20 +126,19 @@
@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){
+ if(OrderStatusEnum.WAIT_FINISH.getValue() != status && mallOrderInfo.getDeliveryState() != 2){
continue;
// return new FebsResponse().fail().message("订单不是待确认到货状态");
}
@@ -147,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());
@@ -237,4 +234,21 @@
return new FebsResponse().success().data(apiLeaderInfoVo);
}
+ @Override
+ public FebsResponse findTeamOrderMarkCnt() {
+ MallMember loginUser = LoginUserUtil.getLoginUser();
+ MallTeamLeader mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(loginUser.getInviteId());
+ String uniqueCode = mallTeamLeader.getUniqueCode();
+ List<Map<String, Integer>> maps = mallOrderInfoMapper.selectMemberOrderStatusCntByUniquecode(uniqueCode);
+ Map<Integer, Integer> orderCnt = new HashMap<>();
+ if (CollUtil.isNotEmpty(maps)) {
+ for (Map<String, Integer> map : maps) {
+ orderCnt.put(map.get("status"), map.get("cnt"));
+ }
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("order", orderCnt);
+ return new FebsResponse().success().data(result);
+ }
+
}
--
Gitblit v1.9.1