From 2740ae64f4cf013a13c0fa17f23059dfc2a9c5ea Mon Sep 17 00:00:00 2001
From: admin <1752476835@qq.com>
Date: Wed, 24 Jul 2024 09:54:20 +0800
Subject: [PATCH] fix

---
 .../service/IPlayShopArticleInfoService.java  |  8 +++-
 .../impl/PlayShopArticleInfoServiceImpl.java  | 15 +++++++-
 .../weichat/controller/WxShopController.java  | 38 ++++++++++++++++++-
 .../entity/PlayShopArticleInfoQueryVo.java    | 16 ++++++++
 .../entity/PlayShopArticleInfoReturnVo.java   | 22 +++++++++++
 .../weichat/entity/PlayShopReadArticleVo.java | 16 ++++++++
 6 files changed, 112 insertions(+), 3 deletions(-)
 create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoQueryVo.java
 create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoReturnVo.java
 create mode 100644 play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java

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 ea4f613..1ca540a 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
@@ -20,7 +20,13 @@ public interface IPlayShopArticleInfoService extends IService<PlayShopArticleInf
      */
     PlayShopArticleInfoEntity selectById(String id);
 
-
+    /**
+     * 根据文章类型查询店铺文章
+     *
+     * @param type 店铺文章类型
+     * @return 店铺文章信息
+     */
+    PlayShopArticleInfoEntity selectByType(String type);
     /**
      * 查询店铺文章信息列表
      *
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 a0b243f..4994d42 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
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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;
@@ -27,6 +28,14 @@ public class PlayShopArticleInfoServiceImpl extends ServiceImpl<PlayShopArticleI
     @Resource
     private PlayShopCarouselInfoMapper playCarouselInfoMapper;
 
+
+    @Override
+    public PlayShopArticleInfoEntity selectByType(String type) {
+        LambdaQueryWrapper<PlayShopArticleInfoEntity> lambdaWrapper = new LambdaQueryWrapper<>();
+        lambdaWrapper.eq(PlayShopArticleInfoEntity::getArticleType, type);
+        return this.baseMapper.selectOne(lambdaWrapper);
+    }
+
     /**
      * 查询店铺首页轮播
      *
@@ -35,7 +44,11 @@ public class PlayShopArticleInfoServiceImpl extends ServiceImpl<PlayShopArticleI
      */
     @Override
     public PlayShopArticleInfoEntity selectById(String id) {
-        return this.baseMapper.selectById(id);
+        PlayShopArticleInfoEntity entity = this.baseMapper.selectById(id);
+        if (entity == null) {
+            throw new CustomException("对象不存在");
+        }
+        return entity;
     }
 
 
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java
index e8b012c..51aa1a7 100644
--- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxShopController.java
@@ -1,12 +1,19 @@
 package com.starry.admin.modules.weichat.controller;
 
+import com.starry.admin.common.aspect.ClerkUserLogin;
+import com.starry.admin.modules.shop.module.entity.PlayShopArticleInfoEntity;
 import com.starry.admin.modules.shop.module.entity.PlayShopCarouselInfoEntity;
+import com.starry.admin.modules.shop.service.IPlayShopArticleInfoService;
 import com.starry.admin.modules.shop.service.IPlayShopCarouselInfoService;
+import com.starry.admin.modules.weichat.entity.PlayShopArticleInfoQueryVo;
+import com.starry.admin.modules.weichat.entity.PlayShopArticleInfoReturnVo;
+import com.starry.admin.modules.weichat.entity.PlayShopReadArticleVo;
 import com.starry.admin.modules.weichat.entity.shop.ShopHomeCarouseInfoReturnVo;
 import com.starry.common.result.R;
 import com.starry.common.utils.ConvertUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -14,7 +21,7 @@ import javax.annotation.Resource;
 import java.util.List;
 
 /**
- * 动态接口
+ * 店铺接口
  *
  * @author admin
  * @since 2024/5/20 下午11:19
@@ -28,7 +35,12 @@ public class WxShopController {
     @Resource
     private IPlayShopCarouselInfoService playShopCarouselInfoService;
 
+    @Resource
+    IPlayShopArticleInfoService playShopArticleInfoService;
 
+    /**
+     * 获取首页轮播图
+     */
     @GetMapping(value = "custom/getShopHomeCarouseInfo")
     public R getShopHomeCarouseInfo() {
         List<PlayShopCarouselInfoEntity> entities = playShopCarouselInfoService.selectHomeCarouselInfo();
@@ -36,4 +48,28 @@ public class WxShopController {
     }
 
 
+    /**
+     * 获取店铺文章
+     */
+    @ClerkUserLogin
+    @GetMapping(value = "clerk/getShopArticleInfo")
+    public R getShopArticleInfo(@RequestBody PlayShopArticleInfoQueryVo vo) {
+        PlayShopArticleInfoEntity entity = playShopArticleInfoService.selectByType(vo.getType());
+        return R.ok(ConvertUtil.entityToVo(entity, PlayShopArticleInfoReturnVo.class));
+    }
+
+
+    /**
+     * 阅读店铺文章
+     */
+    @ClerkUserLogin
+    @GetMapping(value = "clerk/readShopArticleInfo")
+    public R readShopArticleInfo(@RequestBody PlayShopReadArticleVo vo) {
+        PlayShopArticleInfoEntity entity = playShopArticleInfoService.selectById(vo.getId());
+        entity.setVisitsNumber(entity.getVisitsNumber() + 1);
+        playShopArticleInfoService.update(entity);
+        return R.ok("成功");
+    }
+
+
 }
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoQueryVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoQueryVo.java
new file mode 100644
index 0000000..57be945
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoQueryVo.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.weichat.entity;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author admin
+ * @since 2024/7/24 上午9:36
+ **/
+@Data
+public class PlayShopArticleInfoQueryVo {
+
+    @NotNull(message = "type不能为空")
+    private String type;
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoReturnVo.java
new file mode 100644
index 0000000..6d6b564
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopArticleInfoReturnVo.java
@@ -0,0 +1,22 @@
+package com.starry.admin.modules.weichat.entity;
+
+import lombok.Data;
+
+/**
+ * @author admin
+ * @since 2024/7/24 上午9:36
+ **/
+@Data
+public class PlayShopArticleInfoReturnVo {
+
+    private String id;
+    /**
+     * 文章标题
+     **/
+    private String articleTitle;
+
+    /**
+     * 文章内容
+     **/
+    private String articleContent;
+}
diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java
new file mode 100644
index 0000000..8736647
--- /dev/null
+++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/entity/PlayShopReadArticleVo.java
@@ -0,0 +1,16 @@
+package com.starry.admin.modules.weichat.entity;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author admin
+ * @since 2024/7/24 上午9:36
+ **/
+@Data
+public class PlayShopReadArticleVo {
+
+    @NotNull(message = "id不能为空")
+    private String id;
+}