From 75d2f5d8a0124041caad304cc8a3b3615f5d2de6 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 21 十月 2023 14:16:47 +0800
Subject: [PATCH] 新增文章接口

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
index c041e0e..2d7dfaf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -156,9 +156,8 @@
      */
     @ApiOperation(value = "删除便民服务商家")
     @DeleteMapping("/merchant/delete")
-    public R deleteMerchant(@RequestParam("merchantId") String merchantId,
-                            @RequestParam("operator") String operator) {
-        return jinhuiCommunityService.deleteMerchant(merchantId, operator);
+    public R deleteMerchant(@RequestParam("merchantId") String merchantId) {
+        return jinhuiCommunityService.deleteMerchant(merchantId);
     }
 
     /**
@@ -246,6 +245,7 @@
     @ApiOperation(value = "商家评论列添加")
     @PostMapping("/merchantEvaluate/addData")
     public R merchantEvaluateAddData(@RequestBody JinghuiMerchantEvaluateVO item) {
+        item.setUserId(getUserId()+"");
         return jinhuiCommunityService.merchantEvaluateAddData(item);
     }
 
@@ -618,7 +618,43 @@
         JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO();
         vo.setId(id);
         vo.setCancelType("1");
+        vo.setCancelTime(new Date());
         return jinhuiCommunityService.orderEditData(vo);
     }
 
+
+    /******************************************************************************************************
+     *
+     *                    金汇文章
+     *
+     *******************************************************************************************************/
+    /**
+     * 分页查询
+     * @param
+     * @return
+     */
+    @ApiOperation(value = "金汇文章列表", response = JinhuiArticleManagementVO.class)
+    @GetMapping("/articleGetList")
+    public R articleGetList(@RequestParam("pageNum") int pageNum,
+                            @RequestParam("pageSize")  int pageSize)
+    {
+        return jinhuiCommunityService.articleGetList(pageNum,pageSize,"1");
+    }
+
+    /**
+     * 详情
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "金汇文章详情", response = JinhuiArticleManagementVO.class)
+    @GetMapping("/articleGetDetails")
+    public R articleGetDetails(@RequestParam("id") String id)
+    {
+        return jinhuiCommunityService.articleGetDetails(id);
+    }
+
+
+
+
+
 }

--
Gitblit v1.7.1