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

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

Browse Source
This commit is contained in:
苏竹红
2024-01-05 17:20:48 +08:00
parent 6c28b50487 f562df93d0
commit 593a531f0a
7 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java
View File

@@ -155,11 +155,11 @@ public interface ExhibitionService {
/**
* 获取线索参加的会销详情
*
* @param exhibitionId
* @param exhibitionGroupId
* @param partnerLineId
* @return
*/
PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId);
PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId);
/**
* 自动结束会销

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

@@ -740,8 +740,14 @@ public class ExhibitionServiceImpl implements ExhibitionService {
}
@Override
public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionId, Long partnerLineId) {
return hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionId, partnerLineId);
public PartnerExhibitionInfoVO getExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) {
PartnerExhibitionInfoVO partnerExhibitionInfo = hyExhibitionDAO.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId);
partnerExhibitionInfo.setWhetherIntentionApply(Boolean.TRUE);
HyPartnerIntentInfoDO intentInfo = hyPartnerIntentInfoDAO.selectByLineId(partnerLineId);
if (intentInfo == null) {
partnerExhibitionInfo.setWhetherIntentionApply(Boolean.FALSE);
}
return partnerExhibitionInfo;
}
@Override