From 4c5b046107d88c25dc5f94abe4b3061a406f19cc Mon Sep 17 00:00:00 2001 From: admin <1752476835@qq.com> Date: Thu, 25 Jul 2024 23:10:53 +0800 Subject: [PATCH] fix --- .../PlayShopArticleInfoController.java | 21 ++++++++++++++++--- .../module/vo/PlayShopArticleInfoAddVo.java | 2 ++ .../module/vo/PlayShopArticleInfoQueryVo.java | 2 +- .../service/IPlayShopArticleInfoService.java | 10 +++++++++ .../impl/PlayShopArticleInfoServiceImpl.java | 15 +++++++------ .../weichat/controller/WxShopController.java | 11 ++++------ .../entity/PlayShopArticleInfoQueryVo.java | 9 ++++---- 7 files changed, 48 insertions(+), 22 deletions(-) diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java index 2ef1c79..6429000 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopArticleInfoController.java @@ -1,6 +1,7 @@ package com.starry.admin.modules.shop.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.starry.admin.common.exception.CustomException; import com.starry.admin.modules.shop.module.entity.PlayShopArticleInfoEntity; import com.starry.admin.modules.shop.module.vo.PlayShopArticleInfoAddVo; import com.starry.admin.modules.shop.module.vo.PlayShopArticleInfoQueryVo; @@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; /** * 店铺文章信息Controller @@ -40,19 +42,32 @@ public class PlayShopArticleInfoController { /** - * 新增页轮播列表 + * 新增店铺文章信息 */ //@PreAuthorize("@customSs.hasPermission('shop:articleInfo:add')") @PostMapping("/create") public R create(@Validated @RequestBody PlayShopArticleInfoAddVo vo) { PlayShopArticleInfoEntity entity = ConvertUtil.entityToVo(vo, PlayShopArticleInfoEntity.class); - playShopArticleInfoService.create(entity); + PlayShopArticleInfoEntity entity1 = playShopArticleInfoService.selectByType(entity.getArticleType()); + if (entity.getId() == null) { + if (entity1 != null) { + throw new CustomException("同类型的文章只能存在一个"); + } + playShopArticleInfoService.create(entity); + } else { + if (entity1 != null && !entity1.getId().equals(entity.getId())) { + throw new CustomException("同类型的文章只能存在一个"); + } + entity.setUpdatedTime(new Date()); + playShopArticleInfoService.update(entity); + } + return R.ok(); } /** - * 修改页轮播状态 + * 修改店铺文章信息 */ //@PreAuthorize("@customSs.hasPermission('shop:articleInfo:update')") @PostMapping("/handleUpdateState") diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java index 24aae20..450f43f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoAddVo.java @@ -13,6 +13,8 @@ import javax.validation.constraints.NotNull; @Data public class PlayShopArticleInfoAddVo { + + private String id; /** * 文章类型 **/ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoQueryVo.java index 6af975a..861b4d6 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoQueryVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/module/vo/PlayShopArticleInfoQueryVo.java @@ -17,12 +17,12 @@ public class PlayShopArticleInfoQueryVo extends BasePageEntity { * 文章ID **/ private String id; + /** * 文章类型 */ private String articleType; - /** * 文章标题 */ diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java index 1ca540a..dd20cfa 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/IPlayShopArticleInfoService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.starry.admin.modules.shop.module.entity.PlayShopArticleInfoEntity; import com.starry.admin.modules.shop.module.vo.PlayShopArticleInfoQueryVo; +import java.util.List; + /** * 店铺文章信息Service接口 * @@ -36,6 +38,14 @@ public interface IPlayShopArticleInfoService extends IService selectByPage(PlayShopArticleInfoQueryVo vo); + /** + * 查询店铺文章信息列表 + * + * @return 店铺文章信息集合 + */ + List selectByList(); + + /** * 新增店铺文章信息 * diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayShopArticleInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayShopArticleInfoServiceImpl.java index 4994d42..a711d6e 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayShopArticleInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayShopArticleInfoServiceImpl.java @@ -7,15 +7,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.starry.admin.common.exception.CustomException; import com.starry.admin.modules.shop.mapper.PlayShopArticleInfoMapper; -import com.starry.admin.modules.shop.mapper.PlayShopCarouselInfoMapper; import com.starry.admin.modules.shop.module.entity.PlayShopArticleInfoEntity; import com.starry.admin.modules.shop.module.vo.PlayShopArticleInfoQueryVo; import com.starry.admin.modules.shop.service.IPlayShopArticleInfoService; import com.starry.common.utils.IdUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.Arrays; +import java.util.List; /** * 店铺首页轮播Service业务层处理 @@ -25,8 +24,6 @@ import java.util.Arrays; */ @Service public class PlayShopArticleInfoServiceImpl extends ServiceImpl implements IPlayShopArticleInfoService { - @Resource - private PlayShopCarouselInfoMapper playCarouselInfoMapper; @Override @@ -52,6 +49,12 @@ public class PlayShopArticleInfoServiceImpl extends ServiceImpl selectByList() { + return this.baseMapper.selectList(new LambdaQueryWrapper<>()); + + } + @Override public IPage selectByPage(PlayShopArticleInfoQueryVo vo) { LambdaQueryWrapper lambdaWrapper = new LambdaQueryWrapper<>(); @@ -101,7 +104,7 @@ public class PlayShopArticleInfoServiceImpl extends ServiceImpl