From 2ef10386c879b116f17a26960099b29dabcb254f Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 05 九月 2023 15:57:39 +0800
Subject: [PATCH] 新增订单是否评价
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 171 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..d4dd96e 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,15 @@
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.model.vos.community.VolunteerMerchantWithdrawVO;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.service.VolunteerMerchantEvaluateService;
import com.panzhihua.service_community.service.VolunteerMerchantService;
+import com.panzhihua.service_community.service.VolunteerMerchantWithdrawService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -17,13 +23,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,11 +75,164 @@
@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);
+ }
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区商家提现
+ *
+ ****************************************************************************************************************/
+
+ @Resource
+ private VolunteerMerchantWithdrawService vmwService;
+
+
+ /**
+ * 商家提现列表啊
+ * @param disposeType
+ * @return
+ */
+ @GetMapping("/withdraw/getList")
+ public R WithdrawGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam(value = "disposeType", required = false) String disposeType,
+ @RequestParam(value = "merchantName", required = false) String merchantName)
+ {
+ return vmwService.getList(pageNum,pageSize,disposeType,merchantName);
+ }
+
+ /**
+ * 新增商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/withdraw/insert")
+ public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item)
+ {
+ return vmwService.insert(item);
+ }
+
+ /**
+ * 编辑商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/withdraw/update")
+ public R WithdrawUpdate(@RequestBody VolunteerMerchantWithdrawVO item)
+ {
+ return vmwService.update(item);
+ }
+
+ /**
+ * 删除商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/withdraw/delete")
+ public R WithdrawDelete(@RequestParam("id") String id)
+ {
+ return vmwService.delete(id);
+ }
+
+ /**
+ * 处理商家提现
+ * @param id
+ * @return
+ */
+ @GetMapping("/withdraw/dispose")
+ public R WithdrawDispose(@RequestParam("id") String id)
+ {
+ return vmwService.dispose(id);
+ }
+
+
+
+
}
--
Gitblit v1.7.1