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

6
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java
View File

@@ -124,11 +124,11 @@ public class HyExhibitionDAO {
return hyExhibitionMapper.getPartnerExhibitionList(partnerLineId);
}
public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionId, Long partnerLineId) {
if (exhibitionId == null || partnerLineId == null) {
public PartnerExhibitionInfoVO getPartnerExhibitionInfo(Integer exhibitionGroupId, Long partnerLineId) {
if (exhibitionGroupId == null || partnerLineId == null) {
return new PartnerExhibitionInfoVO();
}
return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionId, partnerLineId);
return hyExhibitionMapper.getPartnerExhibitionInfo(exhibitionGroupId, partnerLineId);
}
public List<HyExhibitionDO> querySelective(HyExhibitionDO hyExhibitionDO) {

4
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java
View File

@@ -76,11 +76,11 @@ public interface HyExhibitionMapper {
/**
* 获取线索报名的会销详情
*
* @param exhibitionId
* @param exhibitionGroupId
* @param partnerLineId
* @return
*/
PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionId") Integer exhibitionId, @Param("partnerLineId") Long partnerLineId);
PartnerExhibitionInfoVO getPartnerExhibitionInfo(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("partnerLineId") Long partnerLineId);
/**
* 查询符合条件的会销列表

15
coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
View File

@@ -451,13 +451,14 @@
t1.start_date AS exhibitionDate,
t1.location AS exhibitionPosition
FROM `hy_exhibition` t1
INNER JOIN `hy_partner_exhibition` t2 ON t1.id = t2.exhibition_id
WHERE t1.deleted = 0
AND t1.closed_type = 0
AND t2.deleted = 0
AND t2.participation_status != 7
AND t2.partner_line_id = #{partnerLineId}
AND t1.id = #{exhibitionId}
INNER JOIN `hy_partner_exhibition` t2 ON t1.id = t2.exhibition_id
INNER JOIN `hy_exhibition_group` t3 ON t1.exhibition_group_id = t3.id
WHERE t1.deleted = 0
AND t1.closed_type = 0
AND t2.deleted = 0
AND t2.participation_status != 7
AND t2.partner_line_id = #{partnerLineId}
AND t3.id = #{exhibitionGroupId}
</select>
<update id="batchCloseExhibition">

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

@@ -26,4 +26,7 @@ public class PartnerExhibitionInfoVO {
@ApiModelProperty(value = "展会地点", example = "维也纳大酒店")
private String exhibitionPosition;
@ApiModelProperty("线索是否填写了意向申请")
private Boolean whetherIntentionApply;
}

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

4
coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java
View File

@@ -53,9 +53,9 @@ public class ExhibitionController {
@GetMapping("/getExhibitionInfo")
@ApiOperation("线索参加的会销详情")
public ResponseResult<PartnerExhibitionInfoVO> getExhibitionInfo(@RequestParam(required = true, value = "exhibitionId") Integer exhibitionId) {
public ResponseResult<PartnerExhibitionInfoVO> getExhibitionInfo(@RequestParam(required = true, value = "exhibitionGroupId") Integer exhibitionGroupId) {
PartnerUserInfoVO user = PartnerUserHolder.getUser();
return ResponseResult.success(exhibitionService.getExhibitionInfo(exhibitionId, user.getPartnerLineId()));
return ResponseResult.success(exhibitionService.getExhibitionInfo(exhibitionGroupId, user.getPartnerLineId()));
}
}