diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index e24eb6f3d..8fbef2cd8 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -548,7 +548,7 @@ - #{partnerId} + #{lineId} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java index 17566db09..4703a817d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoVO.java @@ -2,14 +2,17 @@ package com.cool.store.vo; import cn.hutool.core.date.DateUtil; import com.cool.store.entity.HyPartnerLineInfoDO; +import com.cool.store.entity.HyPartnerUserInfoDO; import com.cool.store.utils.CoolDateUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Optional; /** * @Author suzhuhong @@ -82,7 +85,7 @@ public class PartnerLineInfoVO { * @param lineList * @return */ - public static List convertList(List lineList, Map userNamePhoneMap){ + public static List convertList(List lineList, Map userNamePhoneMap, Map partnerMap){ List resultList = new ArrayList<>(); for (HyPartnerLineInfoDO line : lineList) { PartnerLineInfoVO result = new PartnerLineInfoVO(); @@ -100,6 +103,11 @@ public class PartnerLineInfoVO { result.setCertifyFile(line.getCertifyFile()); result.setCloseUserId(line.getCloseUserId()); result.setCloseUserName(userNamePhoneMap.get(line.getCloseUserId())); + HyPartnerUserInfoDO partnerUser = partnerMap.get(line.getPartnerId()); + String partnerUserName = Optional.ofNullable(partnerUser).map(HyPartnerUserInfoDO::getUsername).orElse(StringUtils.EMPTY); + String partnerUserPhone = Optional.ofNullable(partnerUser).map(HyPartnerUserInfoDO::getMobile).orElse(StringUtils.EMPTY); + result.setPartnerUserName(partnerUserName); + result.setPartnerUserPhone(partnerUserPhone); String closeDate = DateUtil.format(line.getCloseTime(), CoolDateUtils.DATE_FORMAT_SEC_7); result.setCloseDate(closeDate); resultList.add(result); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java index 3417d39e2..7cc8207dc 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java @@ -121,7 +121,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService { List list = hyPartnerLineInfoDOPageInfo.getList(); List closeUserIds = list.stream().filter(o -> Objects.nonNull(o.getCloseUserId())).map(HyPartnerLineInfoDO::getCloseUserId).distinct().collect(Collectors.toList()); Map userNamePhoneMap = enterpriseUserDAO.getUserNameAndMobile(closeUserIds); - List resultList = PartnerLineInfoVO.convertList(list, userNamePhoneMap); + List partnerIdList = list.stream().map(HyPartnerLineInfoDO::getPartnerId).collect(Collectors.toList()); + List hyPartnerList = hyPartnerUserInfoDAO.selectByPartnerIds(partnerIdList); + Map partnerMap = hyPartnerList.stream().collect(Collectors.toMap(HyPartnerUserInfoDO::getPartnerId, data->data)); + List resultList = PartnerLineInfoVO.convertList(list, userNamePhoneMap, partnerMap); hyPartnerLineInfoDOPageInfo.setList(resultList); return hyPartnerLineInfoDOPageInfo; } diff --git a/coolstore-partner-webc/src/main/resources/application-ab.properties b/coolstore-partner-webc/src/main/resources/application-ab.properties index 33290e95f..509de0852 100644 --- a/coolstore-partner-webc/src/main/resources/application-ab.properties +++ b/coolstore-partner-webc/src/main/resources/application-ab.properties @@ -33,7 +33,7 @@ mybatis.mapper-locations=classpath*:mapper/**/*Mapper.xml mybatis.configuration.call-setters-on-nulls=true mybatis.configuration.map-underscore-to-camel-case=true -isv.domain = https://abstore-isv.coolstore.cn +isv.domain = https://abstore-isv.coolstore.cn/isv #rocketmq \u914D\u7F6E rocketmq.accessKey=zK2oVEz4G1ts23d2