协议新增分类

This commit is contained in:
SjS 2025-04-26 17:37:53 +08:00
parent cf9a74528f
commit 66bf3645b6
2 changed files with 23 additions and 28 deletions

View File

@ -16,14 +16,16 @@ public class AdConverterImpl implements AdConverter {
return null; return null;
} }
Ad po = new Ad(); Ad po = new Ad();
po.setAreaId(null); po.setBelong(data.getBelong());
// 基础信息 // 基础信息
if (po.getBelong().equals(AdBlong.STORE.getCode())) { if (po.getBelong().equals(AdBlong.STORE.getCode())) {
po.setAreaId(data.getAreaId()); po.setAreaId(data.getAreaId());
}else{
po.setAreaId(null);
} }
po.setType(data.getType()); po.setType(data.getType());
po.setPicture(data.getPicture()); po.setPicture(data.getPicture());
po.setBelong(data.getBelong());
po.setUrl(data.getUrl()); po.setUrl(data.getUrl());
po.setUrlType(data.getUrlType()); po.setUrlType(data.getUrlType());
return po; return po;
@ -36,14 +38,14 @@ public class AdConverterImpl implements AdConverter {
} }
Ad po = new Ad(); Ad po = new Ad();
// 基础信息 // 基础信息
po.setAreaId(null); po.setBelong(data.getBelong());
if (po.getBelong().equals(AdBlong.STORE.getCode())) { if (po.getBelong().equals(AdBlong.STORE.getCode())) {
po.setAreaId(data.getAreaId()); po.setAreaId(data.getAreaId());
}else{
po.setAreaId(null);
} }
po.setAreaId(data.getAreaId());
po.setType(data.getType()); po.setType(data.getType());
po.setPicture(data.getPicture()); po.setPicture(data.getPicture());
po.setBelong(data.getBelong());
po.setUrl(data.getUrl()); po.setUrl(data.getUrl());
po.setUrlType(data.getUrlType()); po.setUrlType(data.getUrlType());
return po; return po;

View File

@ -31,8 +31,7 @@ import com.ruoyi.bst.ad.service.AdService;
* @date 2025-04-01 * @date 2025-04-01
*/ */
@Service @Service
public class AdServiceImpl implements AdService public class AdServiceImpl implements AdService {
{
@Autowired @Autowired
private AdMapper adMapper; private AdMapper adMapper;
@Autowired @Autowired
@ -51,8 +50,7 @@ public class AdServiceImpl implements AdService
* @return 广告 * @return 广告
*/ */
@Override @Override
public AdVO selectAdByAdId(Long adId) public AdVO selectAdByAdId(Long adId) {
{
return adMapper.selectAdByAdId(adId); return adMapper.selectAdByAdId(adId);
} }
@ -63,8 +61,7 @@ public class AdServiceImpl implements AdService
* @return 广告 * @return 广告
*/ */
@Override @Override
public List<AdVO> selectAdList(AdQuery ad) public List<AdVO> selectAdList(AdQuery ad) {
{
return adMapper.selectAdList(ad); return adMapper.selectAdList(ad);
} }
@ -75,21 +72,20 @@ public class AdServiceImpl implements AdService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertAd(Ad ad) public int insertAd(Ad ad) {
{
// 默认设置为商户广告 // 默认设置为商户广告
if (ad.getBelong() == null || ad.getBelong().equals("")){ if (ad.getBelong() == null || ad.getBelong().equals("")) {
ad.setBelong(AdBlong.STORE.getCode()); ad.setBelong(AdBlong.STORE.getCode());
} }
// 商户广告存在上限 // 商户广告存在上限
if (ad.getBelong().equals(AdBlong.STORE.getCode())){ if (ad.getBelong().equals(AdBlong.STORE.getCode())) {
AreaVO area = areaService.selectAreaById(ad.getAreaId()); AreaVO area = areaService.selectAreaById(ad.getAreaId());
ad.setStoreId(area.getUserId()); ad.setStoreId(area.getUserId());
// 条件查询广告 // 条件查询广告
AdQuery query = new AdQuery(); AdQuery query = new AdQuery();
query.setAreaId(ad.getAreaId()); query.setAreaId(ad.getAreaId());
query.setDeleted(false); query.setDeleted(false);
ServiceUtil.assertion(adMapper.selectOne(query)!=null,"当前运营区存在广告已达上限"); ServiceUtil.assertion(adMapper.selectOne(query) != null, "当前运营区存在广告已达上限");
} }
ad.setCreateTime(DateUtils.getNowDate()); ad.setCreateTime(DateUtils.getNowDate());
return adMapper.insertAd(ad); return adMapper.insertAd(ad);
@ -102,18 +98,17 @@ public class AdServiceImpl implements AdService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateAd(Ad ad) public int updateAd(Ad ad) {
{ if (ad.getAreaId() != null) {
if (ad.getAreaId() != null){
AdVO oldAd = adMapper.selectAdByAdId(ad.getAdId()); AdVO oldAd = adMapper.selectAdByAdId(ad.getAdId());
ServiceUtil.assertion(oldAd == null,"广告不存在"); ServiceUtil.assertion(oldAd == null, "广告不存在");
if (!oldAd.getAreaId().equals(ad.getAreaId())){ if (ad.getAreaId() != null) {
int count = adMapper.countByAreaId(ad.getAreaId(),ad.getAdId()); int count = adMapper.countByAreaId(ad.getAreaId(), ad.getAdId());
ServiceUtil.assertion(count>0,"该运营区下广告已达上限"); ServiceUtil.assertion(count > 1, "该运营区下广告已达上限");
} }
} }
AreaVO area = areaService.selectAreaById(ad.getAreaId()); AreaVO area = areaService.selectAreaById(ad.getAreaId());
if (area.getUserId() != null){ if (area.getUserId() != null) {
ad.setStoreId(area.getUserId()); ad.setStoreId(area.getUserId());
} }
ad.setUpdateTime(DateUtils.getNowDate()); ad.setUpdateTime(DateUtils.getNowDate());
@ -127,8 +122,7 @@ public class AdServiceImpl implements AdService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteAdByAdIds(List<Long> adIds) public int deleteAdByAdIds(List<Long> adIds) {
{
return adMapper.deleteAdByAdIds(adIds); return adMapper.deleteAdByAdIds(adIds);
} }
@ -139,8 +133,7 @@ public class AdServiceImpl implements AdService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int deleteAdByAdId(Long adId) public int deleteAdByAdId(Long adId) {
{
return adMapper.deleteAdByAdId(adId); return adMapper.deleteAdByAdId(adId);
} }