From b2fce0dc7dc4ea5dec9792a2bc3ceb9d33d6e07b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 04 九月 2023 13:59:52 +0800
Subject: [PATCH] 修改后台社区动态加载不出来

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java |  101 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 97 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
index a2bf60c..c396d0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java
@@ -1,9 +1,13 @@
 package com.panzhihua.service_community.api;
 
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantEvaluateVO;
 import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.service.VolunteerMerchantEvaluateService;
 import com.panzhihua.service_community.service.VolunteerMerchantService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -17,13 +21,21 @@
     @Resource
     private VolunteerMerchantService vtService;
 
+
+
+    @GetMapping("/getById")
+    public R volunteerMerchantGetById(@RequestParam("id") String id)
+    {
+        return vtService.getById(id);
+    }
+
     /**
      * 分页查询
      * @param
      * @return
      */
     @GetMapping("/getList")
-    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+    public R volunteerMerchantGetList( int pageNum,
                                       @RequestParam("pageSize") int pageSize,
                                       @RequestParam(value = "merchantState", required = false) String merchantState,
                                       @RequestParam(value = "merchantType", required = false) String merchantType,
@@ -61,10 +73,91 @@
 
     @GetMapping("/getUser")
     public R volunteerMerchantGetUser(@RequestParam("communityId") String communityId,
-                     @RequestParam("userName") String userName,
-                     @RequestParam("userPhone") String userPhone)
+                                      @RequestParam(value = "userName", required = false) String userName,
+                                      @RequestParam(value = "userPhone", required = false) String userPhone)
     {
-        return R.ok(vtService.getUser(communityId,userName,userPhone));
+        return vtService.getUser(communityId,userName,userPhone);
+    }
+
+    /**
+     * 是否是商家
+     * @param userId
+     * @return
+     */
+    @GetMapping("/isMerchant")
+    public R isMerchant(@RequestParam("userId") String userId)
+    {
+        if(StringUtils.isEmpty(userId))
+        {
+            return R.fail("用户id不能为空");
+        }
+        return vtService.isMerchant(userId);
+    }
+
+    /****************************************************************************************************************
+     *
+     *                      商家评论
+     *
+     ***************************************************************************************************************/
+    @Resource
+    private VolunteerMerchantEvaluateService vmeService;
+
+
+    /**
+     * 商家评论分页查询
+     * @param
+     * @return
+     */
+    @GetMapping("/evaluate/getList")
+    public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+                                      @RequestParam("pageSize") int pageSize,
+                                      @RequestParam("communityId") String communityId,
+                                      @RequestParam("merchantId") String merchantId)
+    {
+        return vmeService.getList(pageNum,pageSize,communityId,merchantId);
+    }
+
+    /**
+     * 商家评论获取详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/evaluate/getData")
+    public R volunteerMerchantGetData(@RequestParam("id") String id)
+    {
+        return vmeService.getData(id);
+    }
+
+    /**
+     * 商家评论新增评价
+     * @return
+     */
+    @PostMapping("/evaluate/insert")
+    public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item)
+    {
+        return vmeService.insert(item);
+    }
+
+    /**
+     * 商家评论更新评价
+     * @return
+     */
+    @PostMapping("/evaluate/update")
+    public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item)
+    {
+        return vmeService.update(item);
+    }
+
+
+    /**
+     * 商家评论删除评价
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/evaluate/delete")
+    public R volunteerMerchantDelete(@RequestParam("id") String id)
+    {
+        return vmeService.delete(id);
     }
 
 

--
Gitblit v1.7.1