moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户活动banner保存到第二banner

Browse Source
This commit is contained in:
hokli
2025-05-16 11:28:46 +08:00
parent 568459bd71
commit 2f1fb7f618
3 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/firstpage/SecondPageBannerAdminService.java
View File

@@ -122,9 +122,13 @@ public class SecondPageBannerAdminService {
firstPageBanner.setDelTag(0);
}
firstPageBanner.setUpdateTime(date);
boolean saveOrUpdate = secondPageBannerService.saveOrUpdate(firstPageBanner);
return this.saveOrUpdateFirstPageBannerV2(firstPageBanner);
}
public Boolean saveOrUpdateFirstPageBannerV2(SecondPageBanner secondPageBanner) {
boolean saveOrUpdate = secondPageBannerService.saveOrUpdate(secondPageBanner);
if (saveOrUpdate) {
jedisService.del(RedisKey.home_second_banner.getKey(firstPageBanner.getBannerType().toString()));
jedisService.del(RedisKey.home_second_banner.getKey(secondPageBanner.getBannerType().toString()));
}
return saveOrUpdate;
}

49
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/userevent/UserEventAdminService.java
View File

@@ -1,11 +1,12 @@
package com.accompany.admin.service.userevent;
import cn.hutool.core.date.DateUtil;
import com.accompany.admin.service.firstpage.FirstPageBannerAdminService;
import com.accompany.admin.service.firstpage.SecondPageBannerAdminService;
import com.accompany.admin.service.system.AdminUserService;
import com.accompany.admin.service.userevent.vo.UserEventAdminVO;
import com.accompany.business.dto.DomainConfigDto;
import com.accompany.business.model.firstpage.FirstPageBanner;
import com.accompany.business.model.firstpage.SecondPageBanner;
import com.accompany.business.model.userevent.UserEvent;
import com.accompany.business.model.userevent.constant.UserEventConstant;
import com.accompany.business.service.BaseSendService;
@@ -55,7 +56,7 @@ public class UserEventAdminService {
@Autowired
private BillRecordService billRecordService;
@Autowired
private FirstPageBannerAdminService firstPageBannerAdminService;
private SecondPageBannerAdminService secondPageBannerAdminService;
@Autowired
private SysConfService sysConfService;
@Autowired
@@ -176,24 +177,24 @@ public class UserEventAdminService {
return;
}
Users users = usersService.getUsersByUid(uid);
FirstPageBanner firstPageBanner = new FirstPageBanner();
firstPageBanner.setPartitionIds(Arrays.asList(users.getPartitionId()));
firstPageBanner.setBannerName(userEvent.getEventTopic());
firstPageBanner.setCreateTime(new Date());
firstPageBanner.setStartTime(userEvent.getEventStartTime());
firstPageBanner.setEndTime(userEvent.getEventEndTime());
firstPageBanner.setBannerPic(userEvent.getEventBanner());
firstPageBanner.setShowType((byte)1);
firstPageBanner.setOperator("sys");
firstPageBanner.setSkipType(FillConstant.SkipType.h5Link);
firstPageBanner.setBannerStatus(Constant.Yes1No0.YES);
firstPageBanner.setSeqNo(1);
firstPageBanner.setBannerType((int)Constant.BannerType.BANNER_HOME);
firstPageBanner.setPlatform("all");
firstPageBanner.setAndroidVersion("1");
firstPageBanner.setIosVersion("1");
firstPageBanner.setShowRule(Constant.ActShowRule.ALWAYS_SHOW);
firstPageBanner.setDelTag((int)Constant.BannerDel.NO_DEL);
SecondPageBanner secondPageBanner = new SecondPageBanner();
secondPageBanner.setPartitionIds(Arrays.asList(users.getPartitionId()));
secondPageBanner.setBannerName(userEvent.getEventTopic());
secondPageBanner.setCreateTime(new Date());
secondPageBanner.setStartTime(userEvent.getEventStartTime());
secondPageBanner.setEndTime(userEvent.getEventEndTime());
secondPageBanner.setBannerPic(userEvent.getEventBanner());
secondPageBanner.setShowType((byte)1);
secondPageBanner.setOperator("sys");
secondPageBanner.setSkipType(FillConstant.SkipType.h5Link);
secondPageBanner.setBannerStatus(Constant.Yes1No0.YES);
secondPageBanner.setSeqNo(1);
secondPageBanner.setBannerType((int)Constant.BannerType.BANNER_HOME);
secondPageBanner.setPlatform("all");
secondPageBanner.setAndroidVersion("1");
secondPageBanner.setIosVersion("1");
secondPageBanner.setShowRule(Constant.ActShowRule.ALWAYS_SHOW);
secondPageBanner.setDelTag((int)Constant.BannerDel.NO_DEL);
String sysConfValueById = sysConfService.getSysConfValueById(DOMAIN_CONFIG);
String domainUrl = "";
@@ -207,10 +208,10 @@ public class UserEventAdminService {
}
}
}
firstPageBanner.setSkipUri(String.format(UserEventConstant.H5_URL, domainUrl, userEvent.getId()));
Boolean firstPageBannerV2 = firstPageBannerAdminService.saveOrUpdateFirstPageBannerV2(firstPageBanner);
if (firstPageBannerV2) {
userEvent.setBannerId(firstPageBanner.getBannerId());
secondPageBanner.setSkipUri(String.format(UserEventConstant.H5_URL, domainUrl, userEvent.getId()));
Boolean secondPageBannerV2 = secondPageBannerAdminService.saveOrUpdateFirstPageBannerV2(secondPageBanner);
if (secondPageBannerV2) {
userEvent.setBannerId(secondPageBanner.getBannerId());
userEventService.updateById(userEvent);
}
}

15
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/userevent/impl/UserEventServiceImpl.java
View File

@@ -3,7 +3,7 @@ package com.accompany.business.service.userevent.impl;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.accompany.business.dto.room.UserEventConfigDto;
import com.accompany.business.model.firstpage.FirstPageBanner;
import com.accompany.business.model.firstpage.SecondPageBanner;
import com.accompany.business.model.userevent.UserEvent;
import com.accompany.business.model.userevent.UserEventData;
import com.accompany.business.model.userevent.UserEventSub;
@@ -13,7 +13,7 @@ import com.accompany.business.model.userevent.vo.UserEventSubVO;
import com.accompany.business.model.userevent.vo.UserEventVO;
import com.accompany.business.mybatismapper.userevent.UserEventMapper;
import com.accompany.business.service.BaseSendService;
import com.accompany.business.service.firstpage.FirstPageBannerService;
import com.accompany.business.service.firstpage.SecondPageBannerService;
import com.accompany.business.service.follow.FansService;
import com.accompany.business.service.gift.GiftRateService;
import com.accompany.business.service.gift.GiftSendRecordService;
@@ -33,7 +33,6 @@ import com.accompany.common.device.DeviceInfo;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.common.utils.PageUtil;
import com.accompany.core.enumeration.BillObjTypeEnum;
import com.accompany.core.enumeration.I18nAlertEnum;
import com.accompany.core.enumeration.PartitionEnum;
@@ -105,7 +104,7 @@ public class UserEventServiceImpl extends ServiceImpl<UserEventMapper, UserEvent
@Autowired
private UserEventDataService userEventDataService;
@Autowired
private FirstPageBannerService firstPageBannerService;
private SecondPageBannerService secondPageBannerService;
@Transactional
@Override
@@ -182,11 +181,11 @@ public class UserEventServiceImpl extends ServiceImpl<UserEventMapper, UserEvent
userEvent.setUpdateTime(new Date());
int updateById = baseMapper.updateById(userEvent);
if (updateById > 0 && userEvent.getPayBanner() == UserEventConstant.PayBanner.YES && userEvent.getBannerId() != 0) {
FirstPageBanner bannerServiceById = firstPageBannerService.getById(userEvent.getBannerId());
SecondPageBanner bannerServiceById = secondPageBannerService.getById(userEvent.getBannerId());
bannerServiceById.setDelTag((int)Constant.BannerDel.DEL);
bannerServiceById.setUpdateTime(new Date());
bannerServiceById.setOperator("uid:" + uid);
firstPageBannerService.updateById(bannerServiceById);
secondPageBannerService.updateById(bannerServiceById);
}
return updateById;
}
@@ -221,11 +220,11 @@ public class UserEventServiceImpl extends ServiceImpl<UserEventMapper, UserEvent
}
for (UserEvent userEvent : userEvents) {
if (userEvent.getPayBanner() == UserEventConstant.PayBanner.YES && userEvent.getBannerId() != 0) {
FirstPageBanner bannerServiceById = firstPageBannerService.getById(userEvent.getBannerId());
SecondPageBanner bannerServiceById = secondPageBannerService.getById(userEvent.getBannerId());
bannerServiceById.setDelTag((int)Constant.BannerDel.DEL);
bannerServiceById.setUpdateTime(new Date());
bannerServiceById.setOperator("uid:" + uid);
firstPageBannerService.updateById(bannerServiceById);
secondPageBannerService.updateById(bannerServiceById);
}
}
return update;