suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/feat/partner1.6_20231226' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
feng.li
2023-12-27 18:21:20 +08:00
parent 3702e7000b d3841f3044
commit c415b8b2d2
4 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -1047,6 +1047,7 @@
<select id="lineInvestmentList" resultType="com.cool.store.dto.partner.LineInterviewDTO"> <select id="lineInvestmentList" resultType="com.cool.store.dto.partner.LineInterviewDTO">
select select
a.id as lineId, a.id as lineId,
a.line_status as lineStatus,
a.investment_manager as investmentManager, a.investment_manager as investmentManager,
b.mobile as investmentManagerMobile, b.mobile as investmentManagerMobile,
b.name as investmentManagerName b.name as investmentManagerName

2
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java
View File

@@ -14,6 +14,8 @@ public class LineInterviewDTO {
private Long lineId; private Long lineId;
private Integer lineStatus;
private String investmentManager; private String investmentManager;
private String investmentManagerName; private String investmentManagerName;

2
coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java
View File

@@ -20,6 +20,8 @@ public class ExhibitionLineVO {
private Integer lineId; private Integer lineId;
private Integer lineStatus;
private Integer wantShopArea; private Integer wantShopArea;
private String wantShopAreaName; private String wantShopAreaName;

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

@@ -490,6 +490,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
exhibitionLineVO.setId(Integer.valueOf(x.getExhibitionId())); exhibitionLineVO.setId(Integer.valueOf(x.getExhibitionId()));
exhibitionLineVO.setWantShopAreaName(x.getWantShopAreaName().replace("/", " ")); exhibitionLineVO.setWantShopAreaName(x.getWantShopAreaName().replace("/", " "));
exhibitionLineVO.setInvestmentManager(investment.getInvestmentManager()); exhibitionLineVO.setInvestmentManager(investment.getInvestmentManager());
exhibitionLineVO.setLineStatus(investment.getLineStatus());
exhibitionLineVO.setInvestmentManagerName(investment.getInvestmentManagerName()); exhibitionLineVO.setInvestmentManagerName(investment.getInvestmentManagerName());
exhibitionLineVO.setInvestmentManagerMobile(investment.getInvestmentManagerMobile()); exhibitionLineVO.setInvestmentManagerMobile(investment.getInvestmentManagerMobile());
exhibitionLineVO.setInterviewer(inter.getInterviewer()); exhibitionLineVO.setInterviewer(inter.getInterviewer());