From eab74d698bb5c840146cc7bd54be2462f3ca4074 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 15:42:44 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 022a097..9f9a6e4 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
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.OrderDeliveryStateEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -10,6 +11,7 @@
import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.MallTeamLeaderMapper;
@@ -50,6 +52,7 @@
private final MallMemberMapper mallMemberMapper;
private final IXcxPayService iXcxPayService;
private final SpringContextHolder springContextHolder;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
@Override
@Transactional
@@ -129,12 +132,13 @@
@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;
@@ -152,13 +156,15 @@
OrderStateDto orderStateDto = new OrderStateDto();
orderStateDto.setOrderNo(mallOrderInfo.getOrderNo());
String productNames = getProductNames(mallOrderInfo.getMemberId(), mallOrderInfo.getId());
- orderStateDto.setGoodsName(StrUtil.isEmpty(productNames)?"商品":productNames);
- orderStateDto.setOrderState("已送达自提点");
+ orderStateDto.setGoodsName(StrUtil.sub(productNames,0,10)+"...");
+ orderStateDto.setOrderState("已送达");
+ orderStateDto.setTakeCode(mallOrderInfo.getTakeCode());
String takeUniqueCode = mallOrderInfo.getTakeUniqueCode();
MallTeamLeader mallTeamLeader = mallTeamLeaderMapper.selectLeaderByUniqueCode(takeUniqueCode);
- orderStateDto.setAddressArea(mallTeamLeader.getAddressArea());
+ orderStateDto.setAddressArea(StrUtil.sub(mallTeamLeader.getAddressArea(),0,10)+"...");
orderStateDto.setOpenId(mallMemberMapper.selectById(mallOrderInfo.getMemberId()).getOpenId());
- orderStateDto.setTemplateId(WechatConfigure.WX_ORDER_STATEMSG_TEMPLATE_ID);
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getType(), DataDictionaryEnum.WX_TEMPLATE_ID_ONE.getCode());
+ orderStateDto.setTemplateId(dataDictionaryCustom.getValue());
iXcxPayService.pushOrderToAddress(orderStateDto);
}
return new FebsResponse().success().message("确认成功");
@@ -242,7 +248,14 @@
@Override
public FebsResponse findTeamOrderMarkCnt() {
MallMember loginUser = LoginUserUtil.getLoginUser();
- MallTeamLeader mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(loginUser.getInviteId());
+ Long memberId = loginUser.getId();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+
+ log.info(mallMember.getInviteId());
+ MallTeamLeader mallTeamLeader = this.baseMapper.selectLeaderByUniqueCode(mallMember.getInviteId());
+ if(ObjectUtil.isEmpty(mallTeamLeader)){
+ return new FebsResponse().success();
+ }
String uniqueCode = mallTeamLeader.getUniqueCode();
List<Map<String, Integer>> maps = mallOrderInfoMapper.selectMemberOrderStatusCntByUniquecode(uniqueCode);
Map<Integer, Integer> orderCnt = new HashMap<>();
--
Gitblit v1.9.1