diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java index 93da56559..6d3f5fbce 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/SMSMsgEnum.java @@ -18,7 +18,9 @@ public enum SMSMsgEnum { SMS_INVATE("短信邀约", "【沪上阿姨】感谢您对沪上阿姨品牌的关注与支持，您可通过链接登记加盟申请信息，我们的客户经理将在第一时间与您联系。{$var}", "d7772108bb7d9767494818bcd39d2ec1"), - EXHIBITION_INFO_UPDATE("展会信息变更","【沪上阿姨】亲爱的伙伴，您好！您近期报名的加盟推介会信息有更新。名称为{$var}，日期为{$var}，地址为{$var}。感谢您的关注，期待早日与您合作！{$var}","d7772108bb7d9767494818bcd39d2ec1") + EXHIBITION_INFO_UPDATE("展会信息变更","【沪上阿姨】亲爱的伙伴，您好！您近期报名的加盟推介会信息有更新。名称为{$var}，日期为{$var}，地址为{$var}。感谢您的关注，期待早日与您合作！{$var}","d7772108bb7d9767494818bcd39d2ec1"), + + EXHIBITION_CLOSE("展会结束","【沪上阿姨】亲爱的伙伴，您好！非常感谢您报名和参加我们的加盟推介会，若您想继续咨询合作事项，仍可微信联系您的客户经理为您解答。沪上阿姨祝您返程顺利，早日开店！","d7772108bb7d9767494818bcd39d2ec1") ; private String title; diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java index 68ae49365..fffab2884 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java @@ -112,4 +112,11 @@ public class HyExhibitionDAO { return hyExhibitionMapper.lineSignUpCount(exhibitionGroupId,lineId); } + public List listByExhibitionGroupId(Integer exhibitionGroupId,Boolean includeClose){ + if (exhibitionGroupId==null){ + return new ArrayList<>(); + } + return hyExhibitionMapper.listByExhibitionGroupId(exhibitionGroupId,includeClose); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java index 3e8204eb3..a2cf1d2eb 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerExhibitionDAO.java @@ -2,10 +2,12 @@ package com.cool.store.dao; import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO; import com.cool.store.dto.exhibition.ExhibitionLineDTO; +import com.cool.store.dto.exhibition.PartnerSignUpDTO; import com.cool.store.entity.HyExhibitionDO; import com.cool.store.entity.HyPartnerExhibitionDO; import com.cool.store.entity.HyPartnerExhibitionInterviewDO; import com.cool.store.mapper.HyPartnerExhibitionMapper; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Repository; @@ -135,7 +137,10 @@ public class HyPartnerExhibitionDAO { return hyPartnerExhibitionMapper.getPartnerExhibition(exhibitionId,lindId); } - public Integer partnerSignUpCount(Long lineId){ - return hyPartnerExhibitionMapper.partnerSignUpCount(lineId); + public List partnerSignUpCount(List lineIds){ + if (CollectionUtils.isEmpty(lineIds)){ + return new ArrayList<>(); + } + return hyPartnerExhibitionMapper.partnerSignUpCount(lineIds); } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java index 3eadf1ac7..11219ca6a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerIntentInfoDAO.java @@ -4,6 +4,7 @@ import com.cool.store.dto.partner.PartnerIntentApplyInfoDTO; import com.cool.store.entity.HyPartnerIntentInfoDO; import com.cool.store.mapper.HyPartnerIntentInfoMapper; import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -85,5 +86,4 @@ public class HyPartnerIntentInfoDAO { return hyPartnerIntentInfoMapper.updateAcquaintanceFlag(id,acquaintanceFlag,acquaintanceName,acquaintanceRelationshipType,otherRelationshipType); } - } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java index 600a19ea3..1946f9e4b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java @@ -228,18 +228,25 @@ public class HyPartnerLineInfoDAO { } - public List lineInterviewList(List lineIds){ + public List lineInterviewList(List lineIds){ if (CollectionUtils.isEmpty(lineIds)){ return new ArrayList<>(); } return hyPartnerLineInfoMapper.lineInterviewList(lineIds); } - public List lineInvestmentList(List lineIds){ + public List lineInvestmentList(List lineIds){ if (CollectionUtils.isEmpty(lineIds)){ return new ArrayList<>(); } return hyPartnerLineInfoMapper.lineInvestmentList(lineIds); } + public int batchUpdate(List records){ + if (CollectionUtils.isEmpty(records)){ + return -1; + } + return hyPartnerLineInfoMapper.batchUpdate(records); + } + } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java index a0d778eff..2a3b0223d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java @@ -58,4 +58,12 @@ public interface HyExhibitionMapper { Integer lineSignUpCount(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("lineId") Long lineId); + /** + * 查询展会组下展会 (参数控制是否包含关闭的展会) + * @param exhibitionGroupId + * @param includeClose true-包含 false-不包含 + * @return + */ + List listByExhibitionGroupId(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("includeClose") Boolean includeClose); + } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java index 1387bd0dc..cd3acf42b 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerExhibitionMapper.java @@ -2,6 +2,7 @@ package com.cool.store.mapper; import com.cool.store.dto.exhibition.ExhibitionLineBaseDTO; import com.cool.store.dto.exhibition.ExhibitionLineDTO; +import com.cool.store.dto.exhibition.PartnerSignUpDTO; import com.cool.store.entity.HyExhibitionDO; import com.cool.store.entity.HyPartnerExhibitionDO; import io.swagger.models.auth.In; @@ -102,5 +103,5 @@ public interface HyPartnerExhibitionMapper { * @param lineId * @return */ - Integer partnerSignUpCount(@Param("lineId") Long lineId ); + List partnerSignUpCount(@Param("lineIds") List lineIds ); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java index e02347278..19e19a9c1 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java @@ -323,12 +323,14 @@ public interface HyPartnerLineInfoMapper { * @param list * @return */ - List lineInterviewList(@Param("list") List list); + List lineInterviewList(@Param("list") List list); /** * 查询线索招商经理信息 * @param list * @return */ - List lineInvestmentList(@Param("list") List list); + List lineInvestmentList(@Param("list") List list); + + int batchUpdate(@Param("records") List records); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index 89772f00b..11f6e7fce 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -284,7 +284,7 @@ + + select hpe.partner_id as partnerId, + hpe.partner_line_id as lineId, hpe.exhibition_id as exhibitionId, pu.username as partnerName, pu.mobile as mobile @@ -447,11 +448,16 @@ - + select + a.partner_line_id as lineId , + count(1) as count + from hy_partner_exhibition a + left join hy_exhibition b on a.exhibition_id = b.id + where a.participation_status != 7 and b.closed_type=0 + + #{lineId} + + group by a.partner_line_id \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml index 6dfc8ebf1..078908867 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml @@ -1060,4 +1060,18 @@ + + update hy_partner_line_info + set whether_in_exhibition = CASE id + + WHEN #{record.id} THEN #{record.whetherInExhibition} + + END + + #{record.id} + + + + + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java index cc5faef82..b57fe5209 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java @@ -18,7 +18,7 @@ public class ExhibitionLineDTO { private String exhibitionId; - private Integer lineId; + private Long lineId; private Integer wantShopArea; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/PartnerSignUpDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/PartnerSignUpDTO.java new file mode 100644 index 000000000..67346935c --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/PartnerSignUpDTO.java @@ -0,0 +1,17 @@ +package com.cool.store.dto.exhibition; + +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/12/13 13:25 + * @Version 1.0 + */ +@Data +public class PartnerSignUpDTO { + + private Long lineId; + + private Integer count; + +} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java index 8b4b6f57e..e358b1dac 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/partner/LineInterviewDTO.java @@ -10,7 +10,7 @@ import lombok.Data; @Data public class LineInterviewDTO { - private Integer lineId; + private Long lineId; private String investmentManager; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java index b5dc389a1..00a43115f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java @@ -110,6 +110,29 @@ public interface ExhibitionService { */ SignUpExhibitionVO signUpExhibition(SignUpExhibitionDTO signUpExhibitionDTO,LoginUserInfo userInfo) throws ApiException; + /** + * 取消报名 + * @param exhibitionId + * @param lineId + * @param userInfo + * @return + */ Boolean cancelSignUpExhibition(Integer exhibitionId,Long lineId,LoginUserInfo userInfo); + /** + * 签到 + * @param exhibitionId + * @param lineId + * @param userInfo + * @return + */ + Boolean manualCheckIn(Integer exhibitionId,Long lineId,LoginUserInfo userInfo); + + /** + * 结束展会 + * @param exhibitionId + * @param userInfo + * @return + */ + Boolean closeExhibition(Integer exhibitionId,LoginUserInfo userInfo); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index 0a6bae70f..09452c2d3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -35,7 +35,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,7 +42,6 @@ import javax.annotation.Resource; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -82,6 +80,9 @@ public class ExhibitionServiceImpl implements ExhibitionService { @Autowired private TRTCUtils trtcUtils; + @Resource + HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; + @Resource HyPartnerUserInfoDAO hyPartnerUserInfoDAO; // @Value("${offline.exhibition.channel.id}") @@ -459,13 +460,13 @@ public class ExhibitionServiceImpl implements ExhibitionService { if (CollectionUtils.isEmpty(exhibitionLineDTOS)){ return pageInfo; } - List lineIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getLineId).collect(Collectors.toList()); + List lineIds = exhibitionLineDTOS.stream().map(ExhibitionLineDTO::getLineId).collect(Collectors.toList()); //面试官info List lineInterviewList = hyPartnerLineInfoDAO.lineInterviewList(lineIds); - Map lineInterviewMap = lineInterviewList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date)); + Map lineInterviewMap = lineInterviewList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date)); //招商经理info List lineInvestmentList = hyPartnerLineInfoDAO.lineInvestmentList(lineIds); - Map lineInvestmentMap = lineInvestmentList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date)); + Map lineInvestmentMap = lineInvestmentList.stream().collect(Collectors.toMap(LineInterviewDTO::getLineId, date -> date)); List result = new ArrayList<>(); exhibitionLineDTOS.forEach(x->{ ExhibitionLineVO exhibitionLineVO = new ExhibitionLineVO(); @@ -569,7 +570,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { if (signUpExhibitionVO!=null){ return signUpExhibitionVO; } - //是否重复报名 + //是否重复报名（已结束的展会不算） Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); Integer count = hyExhibitionDAO.lineSignUpCount(exhibitionGroupId, lineId); if (count > 0){ @@ -577,7 +578,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.THREE,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,hyExhibitionGroupDO.getExhibitionGroupName())); } //开始报名 - //判断是否之前报名过改会销 + //判断是否之前报名过该会销 HyPartnerExhibitionDO partnerExhibition = hyPartnerExhibitionDAO.getPartnerExhibition(hyExhibitionDO.getId(), lineId); if (partnerExhibition != null){ partnerExhibition.setParticipationStatus(ExhibitionPartnerStatus.REGISTERED.getCode()); @@ -600,7 +601,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { hyPartnerExhibitionDAO.insertSelective(hyPartnerExhibitionDO); } //计算是否会销中 - whetherInExhibition(lineId,Boolean.TRUE); + whetherInExhibition(Arrays.asList(lineId),Boolean.TRUE); if (sendNotice){ //发送通知 eventCenterHttpRequest.sendFeiShuNotice(FeiShuNoticeMsgEnum.PARTNER_SIGNUP_EXHIBITION,Arrays.asList(investManager),mobileCheckDTO.getPartnerName(),mobileCheckDTO.getMobile(), @@ -620,7 +621,58 @@ public class ExhibitionServiceImpl implements ExhibitionService { partnerExhibition.setUpdater(userInfo.getUserId()); hyPartnerExhibitionDAO.updateByPrimaryKeySelective(partnerExhibition); //计算是否会销中 - whetherInExhibition(lineId,Boolean.FALSE); + whetherInExhibition(Arrays.asList(lineId),Boolean.FALSE); + return Boolean.TRUE; + } + + @Override + public Boolean manualCheckIn(Integer exhibitionId, Long lineId,LoginUserInfo userInfo) { + //签到 + HyPartnerIntentInfoDO hyPartnerIntentInfoDO = hyPartnerIntentInfoDAO.selectByLineId(lineId); + Integer status = ExhibitionPartnerStatus.SIGNED.getCode(); + if (hyPartnerIntentInfoDO != null){ + status = ExhibitionPartnerStatus.APPLIED.getCode(); + } + HyPartnerExhibitionDO partnerExhibition = hyPartnerExhibitionDAO.getPartnerExhibition(exhibitionId, lineId); + partnerExhibition.setParticipationStatus(status); + partnerExhibition.setUpdater(userInfo.getUserId()); + hyPartnerExhibitionDAO.updateByPrimaryKeySelective(partnerExhibition); + return Boolean.TRUE; + } + + @Override + public Boolean closeExhibition(Integer exhibitionId, LoginUserInfo userInfo) { + //查询展会 + HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); + if (hyExhibitionDO == null){ + throw new ServiceException(ErrorCodeEnum.EXHIBITION_NOT_EXIST); + } + hyExhibitionDO.setClosedType(CommonConstants.TWO); + hyExhibitionDO.setUpdater(userInfo.getUserId()); + //更新展会结束状态 + hyExhibitionDAO.updateByPrimaryKeySelective(hyExhibitionDO); + //批量处理报名线索是否会销中状态 + List exhibitionLine = hyPartnerExhibitionDAO.getExhibitionLine(hyExhibitionDO.getId()); + List lineIds = exhibitionLine.stream().map(ExhibitionLineDTO::getLineId).collect(Collectors.toList()); + //结束是否会销中 + whetherInExhibition(lineIds,Boolean.FALSE); + Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); + List hyExhibitionDOS = hyExhibitionDAO.listByExhibitionGroupId(exhibitionGroupId, Boolean.FALSE); + if (CollectionUtils.isEmpty(hyExhibitionDOS)){ + //如果没有会销是打开状态了，则关闭会销组 + HyExhibitionGroupDO hyExhibitionGroupDO = new HyExhibitionGroupDO(); + hyExhibitionGroupDO.setClosed(Boolean.TRUE); + hyExhibitionGroupDO.setId(exhibitionGroupId); + hyExhibitionGroupDAO.updateByPrimaryKeySelective(hyExhibitionGroupDO); + } + //短信通知 + exhibitionLine.stream().forEach(x->{ + try { + eventCenterHttpRequest.sendSmsVariable(x.getMobile(),SMSMsgEnum.EXHIBITION_CLOSE); + } catch (ApiException e) { + log.info("closeExhibition 发送短信通知失败,mobile:{},exhibitionId:{}",x.getMobile(),hyExhibitionDO.getId()); + } + }); return Boolean.TRUE; } @@ -628,16 +680,21 @@ public class ExhibitionServiceImpl implements ExhibitionService { * 计算是否会销中 * @param lineId */ - private void whetherInExhibition(Long lineId,Boolean insertFlag){ + private void whetherInExhibition(List lineId,Boolean insertFlag){ //计算是否会销中(报名了会销(不能是取消报名状态) 且会销属于开发中 ) - Integer count = hyPartnerExhibitionDAO.partnerSignUpCount(lineId); - log.info("partnerSignUpCount:{}",count); + List partnerSignUpDTOS = hyPartnerExhibitionDAO.partnerSignUpCount(lineId); + log.info("whetherInExhibition:{}", JSONObject.toJSONString(partnerSignUpDTOS)); //会销状态 - Boolean exhibitionStatus = (count>CommonConstants.ZERO||insertFlag)?Boolean.TRUE:Boolean.FALSE; - HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); - hyPartnerLineInfoDO.setId(lineId); - hyPartnerLineInfoDO.setWhetherInExhibition(exhibitionStatus); - hyPartnerLineInfoDAO.updateByPrimaryKeySelective(hyPartnerLineInfoDO); + Map map = partnerSignUpDTOS.stream().collect(Collectors.toMap(PartnerSignUpDTO::getLineId, PartnerSignUpDTO::getCount)); + List lineInfoDOS = new ArrayList<>(); + lineId.forEach(x->{ + Boolean exhibitionStatus = (map.get(x)!=null||insertFlag)?Boolean.TRUE:Boolean.FALSE; + HyPartnerLineInfoDO hyPartnerLineInfoDO = new HyPartnerLineInfoDO(); + hyPartnerLineInfoDO.setId(x); + hyPartnerLineInfoDO.setWhetherInExhibition(exhibitionStatus); + lineInfoDOS.add(hyPartnerLineInfoDO); + }); + hyPartnerLineInfoDAO.batchUpdate(lineInfoDOS); } /** diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java index 4041a8c06..3a8dc756e 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -89,7 +89,7 @@ public class ExhibitionController { } - @GetMapping(value = "/getExhibitionLineList") + @GetMapping(value = "/lineListByExhibitionId") @ApiOperation("会销报名列表") public ResponseResult getExhibitionLineList(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, @RequestParam(required = false,value = "participationStatus") Integer participationStatus, @@ -118,9 +118,24 @@ public class ExhibitionController { @ApiOperation("取消报名会销") @GetMapping("/cancelSignUp") public ResponseResult cancelSignUp(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, - @RequestParam(required = true,value = "lineId") Long lineId) throws ApiException { + @RequestParam(required = true,value = "lineId") Long lineId) { LoginUserInfo user = CurrentUserHolder.getUser(); return ResponseResult.success(exhibitionService.cancelSignUpExhibition(exhibitionId,lineId,user)); } + @ApiOperation("签到") + @GetMapping("/manualCheckIn") + public ResponseResult manualCheckIn(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId, + @RequestParam(required = true,value = "lineId") Long lineId) { + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(exhibitionService.manualCheckIn(exhibitionId,lineId,user)); + } + + @ApiOperation("结束会销") + @GetMapping("/closeExhibition") + public ResponseResult closeExhibition(@RequestParam(required = true,value = "exhibitionId") Integer exhibitionId) { + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(exhibitionService.closeExhibition(exhibitionId,user)); + } + } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java index ccad8ff52..ff56ac318 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -35,8 +35,7 @@ public class ExhibitionController { @ApiOperation("报名会销") @PostMapping("/signUpExhibition") public ResponseResult signUpExhibition(@RequestBody SignUpExhibitionDTO dto) throws ApiException { - LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.signUpExhibition(dto,user)); + return ResponseResult.success(exhibitionService.signUpExhibition(dto,new LoginUserInfo())); } }