init
This commit is contained in:
@@ -26,4 +26,8 @@ public class ActivityShopAppInfo extends ActivityShopAppList {
|
||||
* 已经参与男生人数
|
||||
*/
|
||||
private Integer joinManNum;
|
||||
/**
|
||||
* 是否参与报名
|
||||
*/
|
||||
private Boolean joinActivity;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.ruoyi.common.core.domain.PageQuery;
|
||||
import com.ruoyi.common.exception.ServiceException;
|
||||
import com.ruoyi.common.helper.LoginHelper;
|
||||
import com.ruoyi.common.utils.BeanConvertUtil;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.xq.domain.*;
|
||||
@@ -95,6 +96,11 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopMapper,Acti
|
||||
if(activityShop == null){
|
||||
return null;
|
||||
}
|
||||
Long userId = LoginHelper.getUserId();
|
||||
boolean joinActivity = false;
|
||||
if(userId != null){
|
||||
joinActivity = activityUserService.checkJoin(userId, activityId);
|
||||
}
|
||||
ActivityShopAppInfo appInfo = new ActivityShopAppInfo();
|
||||
appInfo.setMustVip(activityShop.getMustVip());
|
||||
appInfo.setMustAuth(activityShop.getMustAuth());
|
||||
@@ -114,6 +120,7 @@ public class ActivityShopServiceImpl extends ServiceImpl<ActivityShopMapper,Acti
|
||||
appInfo.setManMaxNum(activityShop.getManMaxNum());
|
||||
appInfo.setJoinWomenPrice(activityShop.getJoinWomenPrice());
|
||||
appInfo.setJoinManPrice(activityShop.getJoinManPrice());
|
||||
appInfo.setJoinActivity(joinActivity);
|
||||
return appInfo;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user