shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-05-11 21:48:26 +08:00
parent 64ef13972d
commit e49796465e
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/activity/ActivityShopAppInfo.java
View File

@@ -26,4 +26,8 @@ public class ActivityShopAppInfo extends ActivityShopAppList {
* 已经参与男生人数 * 已经参与男生人数
*/ */
private Integer joinManNum; private Integer joinManNum;
/**
* 是否参与报名
*/
private Boolean joinActivity;
} }

7
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/ActivityShopServiceImpl.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.BeanConvertUtil; import com.ruoyi.common.utils.BeanConvertUtil;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.xq.domain.*; import com.ruoyi.xq.domain.*;
@@ -95,6 +96,11 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopMapper,Acti
if(activityShop == null){ if(activityShop == null){
return null; return null;
} }
Long userId = LoginHelper.getUserId();
boolean joinActivity = false;
if(userId != null){
joinActivity = activityUserService.checkJoin(userId, activityId);
}
ActivityShopAppInfo appInfo = new ActivityShopAppInfo(); ActivityShopAppInfo appInfo = new ActivityShopAppInfo();
appInfo.setMustVip(activityShop.getMustVip()); appInfo.setMustVip(activityShop.getMustVip());
appInfo.setMustAuth(activityShop.getMustAuth()); appInfo.setMustAuth(activityShop.getMustAuth());
@@ -114,6 +120,7 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopMapper,Acti
appInfo.setManMaxNum(activityShop.getManMaxNum()); appInfo.setManMaxNum(activityShop.getManMaxNum());
appInfo.setJoinWomenPrice(activityShop.getJoinWomenPrice()); appInfo.setJoinWomenPrice(activityShop.getJoinWomenPrice());
appInfo.setJoinManPrice(activityShop.getJoinManPrice()); appInfo.setJoinManPrice(activityShop.getJoinManPrice());
appInfo.setJoinActivity(joinActivity);
return appInfo; return appInfo;
} }