代码处理

coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml

@@ -83,7 +83,7 @@
 
   <select id="exhibitionLineList" resultType="com.cool.store.dto.exhibition.ExhibitionLineDTO">
     select
-      hpe.id as id ,
+      hpe.id as exhibitionId ,
       hpe.partner_id as partnerId,
       hpe.partner_line_id as lineId,
       hpe.participation_status as participationStatus,
@@ -91,6 +91,7 @@
       hpe.expected_visitors_count as expectedVisitorsCount,
       hpe.expected_information as expectedInformation,
       hpui.username as partnerName,
+      hpui.user_channel_id as channelId,
       hpui.mobile as mobile,
       hoai.id as wantShopArea,
       hoai.area_path as wantShopAreaName

coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java

@@ -36,4 +36,6 @@ public class ExhibitionLineDTO {
 
     private String customerManager;
 
+    private Integer channelId;
+
 }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java

@@ -1,4 +1,5 @@
 package com.cool.store.service.impl;
+
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.cool.store.constants.CommonConstants;
@@ -6,7 +7,6 @@ import com.cool.store.constants.RedisConstant;
 import com.cool.store.context.PartnerUserHolder;
 import com.cool.store.dao.*;
 import com.cool.store.dto.log.UserInfoUpdateDTO;
-import com.cool.store.dto.partner.MobileCheckDTO;
 import com.cool.store.entity.*;
 import com.cool.store.enums.*;
 import com.cool.store.exception.ApiException;
@@ -19,7 +19,6 @@ import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.vo.ApplyBaseInfoVO;
 import com.cool.store.vo.InviteCodeDetailVO;
 import com.cool.store.vo.PartnerUserInfoVO;
-import com.cool.store.vo.exhibition.SignUpExhibitionVO;
 import com.cool.store.vo.partner.PartnerUserBaseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -54,6 +53,13 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
     @Resource
     HyPhoneLocationService hyPhoneLocationService;
 
+    @Resource
+    HyPartnerLineInfoDAO hyPartnerLineInfoDAO;
+    @Resource
+    HyExhibitionDAO hyExhibitionDAO;
+    @Resource
+    HyExhibitionGroupDAO hyExhibitionGroupDAO;
+
     @Override
     public HyPartnerUserInfoDO selectByPartnerId(String partnerId) {
         return hyPartnerUserInfoDAO.selectByPartnerId(partnerId);
@@ -149,12 +155,7 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
         logService.recordPartnerBizLog(operator,hyPartnerLineInfoDO.getId(), OperateTypeEnum.USERINFO_UPDATE,log);
         return applyBaseInfoVO;
     }
-    @Resource
+
-    HyPartnerLineInfoDAO hyPartnerLineInfoDAO;
-    @Resource
-    HyExhibitionDAO hyExhibitionDAO;
-    @Resource
-    HyExhibitionGroupDAO hyExhibitionGroupDAO;
 
     @Override
     public PartnerUserBaseVO getPartnerInfo(String mobile,Integer exhibitionId) {

coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java

@@ -72,6 +72,9 @@ public class ExhibitionServiceImpl implements ExhibitionService {
     @Autowired
     private HyPartnerLineInfoDAO hyPartnerLineInfoDAO;
 
+    @Resource
+    HyPartnerUserChannelDAO hyPartnerUserChannelDAO;
+
     @Autowired
     private InterviewService interviewService;
 
@@ -474,11 +477,16 @@ public class ExhibitionServiceImpl implements ExhibitionService {
         List<LineInterviewDTO> lineInvestmentList = hyPartnerLineInfoDAO.lineInvestmentList(lineIds);
         Map<Long, LineInterviewDTO> lineInvestmentMap = lineInvestmentList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date));
         List<ExhibitionLineVO> result = new ArrayList<>();
+        List<Integer> channelIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getChannelId).collect(Collectors.toList());
+        Map<Integer, String> channelMap = hyPartnerUserChannelDAO.getChannelMapByIds(channelIds);
         exhibitionLineDTOS.forEach(x->{
             ExhibitionLineVO exhibitionLineVO = new ExhibitionLineVO();
             LineInterviewDTO inter = lineInterviewMap.getOrDefault(x.getLineId(), new LineInterviewDTO());
             LineInterviewDTO investment = lineInvestmentMap.getOrDefault(x.getLineId(), new LineInterviewDTO());
             BeanUtil.copyProperties(x,exhibitionLineVO);
+            exhibitionLineVO.setChannelName(channelMap.get(x.getChannelId()));
+            exhibitionLineVO.setId(Integer.valueOf(x.getExhibitionId()));
+            exhibitionLineVO.setWantShopAreaName(x.getWantShopAreaName().replace("/", " "));
             exhibitionLineVO.setInvestmentManager(investment.getInvestmentManager());
             exhibitionLineVO.setInvestmentManagerName(investment.getInvestmentManagerName());
             exhibitionLineVO.setInvestmentManagerMobile(investment.getInvestmentManagerMobile());