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

调整

Browse Source
This commit is contained in:
苏竹红
2024-01-08 19:04:43 +08:00
parent fd9e5d1040
commit 672dc9d657
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,8 +106,8 @@ public class HyExhibitionDAO {
return hyExhibitionMapper.listByExhibitionGroupIds(exhibitionGroupIdList,filterCloseExhibition); return hyExhibitionMapper.listByExhibitionGroupIds(exhibitionGroupIdList,filterCloseExhibition);
} }
public Integer lineSignUpCount(Integer exhibitionGroupId, Long lineId){ public ExhibitionDTO lineSignUp(Integer exhibitionGroupId, Long lineId){
return hyExhibitionMapper.lineSignUpCount(exhibitionGroupId,lineId); return hyExhibitionMapper.lineSignUp(exhibitionGroupId,lineId);
} }
public List<HyExhibitionDO> listByExhibitionGroupId(Integer exhibitionGroupId,Boolean includeClose){ public List<HyExhibitionDO> listByExhibitionGroupId(Integer exhibitionGroupId,Boolean includeClose){

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

@@ -56,7 +56,7 @@ public interface HyExhibitionMapper {
List<ExhibitionDTO> listByExhibitionGroupIds(@Param("list") List<Integer> exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition); List<ExhibitionDTO> listByExhibitionGroupIds(@Param("list") List<Integer> exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition);
Integer lineSignUpCount(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("lineId") Long lineId); ExhibitionDTO lineSignUp(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("lineId") Long lineId);
/** /**
* 查询展会组下展会 (参数控制是否包含关闭的展会) * 查询展会组下展会 (参数控制是否包含关闭的展会)

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

@@ -339,8 +339,8 @@
</select> </select>
<select id="lineSignUpCount" resultType="java.lang.Integer"> <select id="lineSignUp" resultType="com.cool.store.dto.exhibition.ExhibitionDTO">
select count(1) from hy_exhibition a left join hy_partner_exhibition b on a.id = b.exhibition_id select a.exhibition_name as exhibitionName from hy_exhibition a left join hy_partner_exhibition b on a.id = b.exhibition_id
<where> <where>
and b.participation_status!=7 and a.closed_type = 0 and b.participation_status!=7 and a.closed_type = 0
<if test="exhibitionGroupId!=null"> <if test="exhibitionGroupId!=null">

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

@@ -6,6 +6,7 @@ import com.cool.store.constants.CommonConstants;
import com.cool.store.constants.RedisConstant; import com.cool.store.constants.RedisConstant;
import com.cool.store.context.PartnerUserHolder; import com.cool.store.context.PartnerUserHolder;
import com.cool.store.dao.*; import com.cool.store.dao.*;
import com.cool.store.dto.exhibition.ExhibitionDTO;
import com.cool.store.dto.log.UserInfoUpdateDTO; import com.cool.store.dto.log.UserInfoUpdateDTO;
import com.cool.store.entity.*; import com.cool.store.entity.*;
import com.cool.store.enums.*; import com.cool.store.enums.*;
@@ -194,20 +195,15 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
//是否重复报名（已结束的展会不算） PC //是否重复报名（已结束的展会不算） PC
if (exhibitionId!=null){ if (exhibitionId!=null){
HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId); HyExhibitionDO hyExhibitionDO = hyExhibitionDAO.selectByPrimaryKey(exhibitionId);
Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); groupId = hyExhibitionDO.getExhibitionGroupId();
Integer count = hyExhibitionDAO.lineSignUpCount(exhibitionGroupId, hyPartnerLineInfoDO.getId());
if (count > 0){
HyExhibitionGroupDO hyExhibitionGroupDO = hyExhibitionGroupDAO.selectByPrimaryKey(exhibitionGroupId);
partnerUserBaseVO.setSignUpStatus(Boolean.FALSE);
partnerUserBaseVO.setSignUpFailCode(CommonConstants.THREE);
partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,hyExhibitionGroupDO.getExhibitionGroupName()));
return partnerUserBaseVO;
}
} }
//移动 //移动
if(groupId!=null){ if(groupId!=null){
Integer count = hyExhibitionDAO.lineSignUpCount(groupId, hyPartnerLineInfoDO.getId()); ExhibitionDTO exhibitionDTO = hyExhibitionDAO.lineSignUp(groupId, hyPartnerLineInfoDO.getId());
if (count == 0){ if (exhibitionDTO !=null){
partnerUserBaseVO.setSignUpStatus(Boolean.FALSE);
partnerUserBaseVO.setSignUpFailCode(CommonConstants.THREE);
partnerUserBaseVO.setSignUpFailMsg(SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,exhibitionDTO.getExhibitionName()));
return partnerUserBaseVO; return partnerUserBaseVO;
} }
} }

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

@@ -625,10 +625,9 @@ public class ExhibitionServiceImpl implements ExhibitionService {
} }
//是否重复报名（已结束的展会不算） //是否重复报名（已结束的展会不算）
Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId(); Integer exhibitionGroupId = hyExhibitionDO.getExhibitionGroupId();
Integer count = hyExhibitionDAO.lineSignUpCount(exhibitionGroupId, lineId); ExhibitionDTO exhibitionDTO = hyExhibitionDAO.lineSignUp(exhibitionGroupId, lineId);
if (count > 0){ if (exhibitionDTO != null){
HyExhibitionGroupDO hyExhibitionGroupDO = hyExhibitionGroupDAO.selectByPrimaryKey(exhibitionGroupId); return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.THREE,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,exhibitionDTO.getExhibitionName()));
return new SignUpExhibitionVO(Boolean.FALSE,CommonConstants.THREE,SignUpStatusEnum.getSignUpFailMsg(SignUpStatusEnum.Sign_UP_FAIL_3,hyExhibitionGroupDO.getExhibitionGroupName()));
} }
//开始报名 //开始报名
//判断是否之前报名过该会销 //判断是否之前报名过该会销