|
@@ -508,7 +508,7 @@ public class ClubServiceImpl implements ClubService {
|
|
return ResponseJson.error("用户身份错误", null);
|
|
return ResponseJson.error("用户身份错误", null);
|
|
}
|
|
}
|
|
// 会员机构
|
|
// 会员机构
|
|
- boolean userFlag1 = (StringUtils.isNotBlank(club.getLinkMan()) && StringUtils.isNotBlank(user.getBindMobile()) && StringUtils.isNotBlank(club.getContractPhone()) && StringUtils.isNotBlank(club.getFax()) && StringUtils.isNotBlank(club.getProfile()) && StringUtils.isNotBlank(club.getName()) && StringUtils.isNotBlank(user.getEmail()) && StringUtils.isNotBlank(club.getShortName()) && club.getProvinceId() != 0 && club.getCityId() != 0 && club.getTownId() != 0 && StringUtils.isNotBlank(club.getAddress()) && StringUtils.isNotBlank(club.getSocialCreditCode()) && StringUtils.isNotBlank(club.getBusinessLicense()) && StringUtils.isNotBlank(club.getShopPhoto()) && null != club.getFirstClubType() && StringUtils.isNotBlank(club.getMainProduct()));
|
|
|
|
|
|
+ boolean userFlag1 = (StringUtils.isNotBlank(club.getLinkMan()) && StringUtils.isNotBlank(user.getBindMobile()) && StringUtils.isNotBlank(club.getContractPhone()) && StringUtils.isNotBlank(club.getFax()) && StringUtils.isNotBlank(club.getProfile()) && StringUtils.isNotBlank(club.getName()) && StringUtils.isNotBlank(user.getEmail()) && StringUtils.isNotBlank(club.getShortName()) && club.getProvinceId() != null && club.getProvinceId() != 0 && club.getCityId() != null && club.getCityId() != 0 && club.getTownId() != null && club.getTownId() != 0 && StringUtils.isNotBlank(club.getAddress()) && StringUtils.isNotBlank(club.getSocialCreditCode()) && StringUtils.isNotBlank(club.getBusinessLicense()) && StringUtils.isNotBlank(club.getShopPhoto()) && null != club.getFirstClubType() && StringUtils.isNotBlank(club.getMainProduct()));
|
|
// 普通机构
|
|
// 普通机构
|
|
boolean userFlag2 = (StringUtils.isNotBlank(club.getLinkMan()) && StringUtils.isNotBlank(user.getBindMobile()) && StringUtils.isNotBlank(club.getContractPhone()) && StringUtils.isNotBlank(club.getFax()) && StringUtils.isNotBlank(club.getProfile()));
|
|
boolean userFlag2 = (StringUtils.isNotBlank(club.getLinkMan()) && StringUtils.isNotBlank(user.getBindMobile()) && StringUtils.isNotBlank(club.getContractPhone()) && StringUtils.isNotBlank(club.getFax()) && StringUtils.isNotBlank(club.getProfile()));
|
|
boolean degreeFlag = (user.getUserIdentity() == 4 && userFlag1) || (user.getUserIdentity() == 2 && userFlag2);
|
|
boolean degreeFlag = (user.getUserIdentity() == 4 && userFlag1) || (user.getUserIdentity() == 2 && userFlag2);
|
|
@@ -526,7 +526,7 @@ public class ClubServiceImpl implements ClubService {
|
|
// 7.今日推荐
|
|
// 7.今日推荐
|
|
int floorId = 6;
|
|
int floorId = 6;
|
|
int index = 1;
|
|
int index = 1;
|
|
- String homeAdvertiseKey = "home_advertise_" + floorId;
|
|
|
|
|
|
+ String homeAdvertiseKey = "user_advertise_" + floorId;
|
|
if (!redisService.exists(homeAdvertiseKey)) {
|
|
if (!redisService.exists(homeAdvertiseKey)) {
|
|
AdvertiseVo homePageAdvertise = new AdvertiseVo();
|
|
AdvertiseVo homePageAdvertise = new AdvertiseVo();
|
|
homePageAdvertise.setAdvertiseTypeId(1001);
|
|
homePageAdvertise.setAdvertiseTypeId(1001);
|