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 14:28:33 +08:00
parent 9f6194912f 53f04491b4
commit ac81c9111b
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,7 @@ public class HyExhibitionDAO {
} }
public Map<String,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<Integer> list) { public Map<Integer,ExhibitionStatisticsDTO> exhibitionStatisticsMap(List<Integer> list) {
if (CollectionUtils.isEmpty(list)) { if (CollectionUtils.isEmpty(list)) {
return new HashMap<>(4); return new HashMap<>(4);
} }

2
coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml
View File

@@ -116,7 +116,7 @@
</if> </if>
</if> </if>
<if test="partnerUserId != null and partnerUserId!=''"> <if test="partnerUserId != null and partnerUserId!=''">
and hpui.user_id = #{partnerUserId,jdbcType=VARCHAR} and hpui.partner_id = #{partnerUserId,jdbcType=VARCHAR}
</if> </if>
</where> </where>
<if test="participationStatus == null"> <if test="participationStatus == null">

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

@@ -13,7 +13,7 @@ public class ExhibitionStatisticsDTO {
/** /**
* 展会code * 展会code
*/ */
private String exhibitionId; private Integer exhibitionId;
/** /**
* 报名人数 * 报名人数

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

@@ -86,6 +86,8 @@ public class ExhibitionServiceImpl implements ExhibitionService {
@Resource @Resource
HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO; HyPartnerIntentInfoDAO hyPartnerIntentInfoDAO;
@Resource
HyPartnerBaseInfoDAO hyPartnerBaseInfoDAO;
@Resource @Resource
HyPartnerUserInfoDAO hyPartnerUserInfoDAO; HyPartnerUserInfoDAO hyPartnerUserInfoDAO;
@@ -275,7 +277,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
.collect(Collectors.toMap(EnterpriseUserDO::getUserId, .collect(Collectors.toMap(EnterpriseUserDO::getUserId,
u -> new CollaboratorVO(u.getUserId(), u.getName()))); u -> new CollaboratorVO(u.getUserId(), u.getName())));
Map<String, ExhibitionStatisticsDTO> StatisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList); Map<Integer, ExhibitionStatisticsDTO> StatisticsMap = hyExhibitionDAO.exhibitionStatisticsMap(codeList);
exhibitionList.forEach(x->{ exhibitionList.forEach(x->{
MyExhibitionVO myExhibitionVO = new MyExhibitionVO(); MyExhibitionVO myExhibitionVO = new MyExhibitionVO();
@@ -554,6 +556,10 @@ public class ExhibitionServiceImpl implements ExhibitionService {
.setCreateUserId(CurrentUserHolder.getUserId()).setCreateUserMobile(CurrentUserHolder.getUser().getMobile()) .setCreateUserId(CurrentUserHolder.getUserId()).setCreateUserMobile(CurrentUserHolder.getUser().getMobile())
.setOperatorType("add").setAllotTime(new Date()).setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode()).setInvestmentManager(hyExhibitionDO.getCreator()); .setOperatorType("add").setAllotTime(new Date()).setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode()).setInvestmentManager(hyExhibitionDO.getCreator());
hyPartnerLineInfoDAO.insertSelective(resultLine); hyPartnerLineInfoDAO.insertSelective(resultLine);
HyPartnerBaseInfoDO resultBase = new HyPartnerBaseInfoDO();
resultBase.setPartnerId(partnerId).setPartnerLineId(resultLine.getId()).setStatus(Integer.valueOf(WorkflowStatusEnum.INTENT_0.getCode())).
setCreateTime(new Date()).setUsername(signUpExhibitionDTO.getPartnerName()).setMobile(signUpExhibitionDTO.getMobile());
hyPartnerBaseInfoDAO.insertSelective(resultBase);
lineId = resultLine.getId(); lineId = resultLine.getId();
} }
//如果是公海状态 但是结束时间不为空 //如果是公海状态 但是结束时间不为空
@@ -667,6 +673,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
throw new ServiceException(ErrorCodeEnum.EXHIBITION_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.EXHIBITION_NOT_EXIST);
} }
hyExhibitionDO.setClosedType(CommonConstants.TWO); hyExhibitionDO.setClosedType(CommonConstants.TWO);
hyExhibitionDO.setCloseTime(new Date());
hyExhibitionDO.setUpdater(userInfo.getUserId()); hyExhibitionDO.setUpdater(userInfo.getUserId());
//更新展会结束状态 //更新展会结束状态
hyExhibitionDAO.updateByPrimaryKeySelective(hyExhibitionDO); hyExhibitionDAO.updateByPrimaryKeySelective(hyExhibitionDO);