diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java index cd0ce5e23..0961f610e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java @@ -136,9 +136,9 @@ public class AdvertRoundController extends XktBaseController { @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") @ApiOperation(value = "根据advertRoundId查看设置的商品及设置的推广图", httpMethod = "GET", response = R.class) - @GetMapping(value = "/set/{advertRoundId}/{storeId}") - public R getSetInfo(@PathVariable("advertRoundId") Long advertRoundId, @PathVariable("storeId") Long storeId) { - return R.ok(BeanUtil.toBean(advertRoundService.getSetInfo(advertRoundId, storeId), AdRoundLatestResVO.class)); + @GetMapping(value = "/set/{advertRoundId}") + public R getSetInfo(@PathVariable("advertRoundId") Long advertRoundId) { + return R.ok(BeanUtil.toBean(advertRoundService.getSetInfo(advertRoundId), AdRoundLatestResVO.class)); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java index 83e65a4ee..def315de8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java @@ -143,8 +143,7 @@ public interface IAdvertRoundService { * 根据推广位置ID及档口ID 获取 设置的推广商品或图片 * * @param advertRoundId 推广位置ID - * @param storeId 档口ID * @return AdRoundLatestResDTO */ - AdRoundLatestResDTO getSetInfo(Long advertRoundId, Long storeId); + AdRoundLatestResDTO getSetInfo(Long advertRoundId); } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java index a1f7e3f19..5d46a4cb4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java @@ -477,15 +477,13 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { * 根据推广位置ID及档口ID 获取 设置的推广商品或图片 * * @param advertRoundId 推广位置ID - * @param storeId 档口ID * @return AdRoundLatestResDTO */ @Override @Transactional(readOnly = true) - public AdRoundLatestResDTO getSetInfo(Long advertRoundId, Long storeId) { + public AdRoundLatestResDTO getSetInfo(Long advertRoundId) { AdvertRound advertRound = this.advertRoundMapper.selectOne(new LambdaQueryWrapper() - .eq(AdvertRound::getId, advertRoundId).eq(AdvertRound::getDelFlag, Constants.UNDELETED) - .eq(AdvertRound::getStoreId, storeId)); + .eq(AdvertRound::getId, advertRoundId).eq(AdvertRound::getDelFlag, Constants.UNDELETED)); AdRoundLatestResDTO roundSetInfoDTO = new AdRoundLatestResDTO(); if (ObjectUtils.isEmpty(advertRound)) { return roundSetInfoDTO;