BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：系统优化；

pull/1121/head
liujiang 2025-09-11 19:43:44 +08:00
parent 68b4a6a2a8
commit eb8ef57fe6
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/AdvertRoundController.java
View File

@ -136,9 +136,9 @@ public class AdvertRoundController extends XktBaseController {
@PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()")
@ApiOperation(value = "根据advertRoundId查看设置的商品及设置的推广图", httpMethod = "GET", response = R.class) @ApiOperation(value = "根据advertRoundId查看设置的商品及设置的推广图", httpMethod = "GET", response = R.class)
@GetMapping(value = "/set/{advertRoundId}/{storeId}") @GetMapping(value = "/set/{advertRoundId}")
public R<AdRoundLatestResVO> getSetInfo(@PathVariable("advertRoundId") Long advertRoundId, @PathVariable("storeId") Long storeId) { public R<AdRoundLatestResVO> getSetInfo(@PathVariable("advertRoundId") Long advertRoundId) {
return R.ok(BeanUtil.toBean(advertRoundService.getSetInfo(advertRoundId, storeId), AdRoundLatestResVO.class)); return R.ok(BeanUtil.toBean(advertRoundService.getSetInfo(advertRoundId), AdRoundLatestResVO.class));
} }

3
xkt/src/main/java/com/ruoyi/xkt/service/IAdvertRoundService.java
View File

@ -143,8 +143,7 @@ public interface IAdvertRoundService {
* 根据推广位置ID及档口ID 获取 设置的推广商品或图片 * 根据推广位置ID及档口ID 获取 设置的推广商品或图片
* *
* @param advertRoundId 推广位置ID * @param advertRoundId 推广位置ID
* @param storeId 档口ID
* @return AdRoundLatestResDTO * @return AdRoundLatestResDTO
*/ */
AdRoundLatestResDTO getSetInfo(Long advertRoundId, Long storeId); AdRoundLatestResDTO getSetInfo(Long advertRoundId);
} }

6
xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java
View File

@ -477,15 +477,13 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService {
* 根据推广位置ID及档口ID 获取 设置的推广商品或图片 * 根据推广位置ID及档口ID 获取 设置的推广商品或图片
* *
* @param advertRoundId 推广位置ID * @param advertRoundId 推广位置ID
* @param storeId 档口ID
* @return AdRoundLatestResDTO * @return AdRoundLatestResDTO
*/ */
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public AdRoundLatestResDTO getSetInfo(Long advertRoundId, Long storeId) { public AdRoundLatestResDTO getSetInfo(Long advertRoundId) {
AdvertRound advertRound = this.advertRoundMapper.selectOne(new LambdaQueryWrapper<AdvertRound>() AdvertRound advertRound = this.advertRoundMapper.selectOne(new LambdaQueryWrapper<AdvertRound>()
.eq(AdvertRound::getId, advertRoundId).eq(AdvertRound::getDelFlag, Constants.UNDELETED) .eq(AdvertRound::getId, advertRoundId).eq(AdvertRound::getDelFlag, Constants.UNDELETED));
.eq(AdvertRound::getStoreId, storeId));
AdRoundLatestResDTO roundSetInfoDTO = new AdRoundLatestResDTO(); AdRoundLatestResDTO roundSetInfoDTO = new AdRoundLatestResDTO();
if (ObjectUtils.isEmpty(advertRound)) { if (ObjectUtils.isEmpty(advertRound)) {
return roundSetInfoDTO; return roundSetInfoDTO;