diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.java index be91177..35497a3 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.java @@ -78,4 +78,6 @@ public interface AdMapper public int logicalDel(@Param("array") List adIds); int countByAreaId(@Param("areaId") Long areaId, @Param("adId") Long adId); + + List selectAdByAreaId(@Param("areaId") Long areaId); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml index 01a41e3..61c7d5a 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml @@ -93,6 +93,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND deleted = 0 + + insert into bst_ad diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java index 65df9b3..c545929 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/AdService.java @@ -64,7 +64,7 @@ public interface AdService AdVO selectOne(AdQuery adQuery); - List toAppVOList(); + List toAppVOList(AdQuery adQuery); public int logicalDel(List adIds); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java index efc78df..37ac35e 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/service/impl/AdServiceImpl.java @@ -146,24 +146,18 @@ public class AdServiceImpl implements AdService @Override - public List toAppVOList() { + public List toAppVOList(AdQuery adQuery) { List list = new ArrayList<>(); - OrderQuery orderQuery = new OrderQuery(); - orderQuery.setUserId(SecurityUtils.getUserId()); - OrderVO orderVO = orderService.selectOne(orderQuery); - // 如果有订单,查询对应商户的广告 - if (orderVO != null) { - AdQuery adStoreVO = adConverter.toAdStoreVO(); - adStoreVO.setStoreId(orderVO.getAreaUserId()); - AdVO vo = adMapper.selectOne(adStoreVO); - if (vo != null) { - list.add(vo); - } + UserVO user = userService.selectUserById(adQuery.getUserId()); + // 查询所属运营区的广告 + List areaAdVOList = adMapper.selectAdByAreaId(user.getAreaId()); + if (areaAdVOList != null) { + list.addAll(areaAdVOList); } // 查询管理员发布的广告 - List adminVOList = adMapper.selectAdList(adConverter.toAdAdminVO()); - if (adminVOList != null) { - list.addAll(adminVOList); + List adminAdVOList = adMapper.selectAdList(adConverter.toAdAdminVO()); + if (adminAdVOList != null) { + list.addAll(adminAdVOList); } return list; } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java index 2b08947..604c352 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppAdController.java @@ -22,8 +22,9 @@ public class AppAdController extends BaseController { @ApiOperation("获取广告") @GetMapping @Anonymous - public AjaxResult getAd() { - return success(adService.toAppVOList()); + public AjaxResult getAd(AdQuery query) { + query.setUserId(getUserId()); + return success(adService.toAppVOList(query)); } }