From 7d882d52edd6484addd7fc5c705e3065b0e6376b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 01 九月 2023 14:32:44 +0800
Subject: [PATCH] 修改商家评论列表报错
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 182 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 179 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
index 5a082a9..24e021e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java
@@ -4,7 +4,10 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerCreditsExchangeVO;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantEvaluateVO;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
@@ -21,6 +24,10 @@
@Resource
private CommunityService communityService;
+
+
+ @Resource
+ private UserService userService;
/**
* 查询单个
@@ -129,7 +136,7 @@
/**
- * 更新商家
+ * 更新商家订单
* @param item
* @return
*/
@@ -237,7 +244,7 @@
}
/**
- * 分页查询
+ * 分页查询商家分类
* @param
* @return
*/
@@ -248,13 +255,182 @@
return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
}
+ /**
+ * 修改商家
+ * @param vtvo
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/update")
+ public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo)
+ {
+ return communityService.updateVolunteerMerchant(vtvo);
+ }
+
+ /**
+ * 获取商家详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/getById")
+ public R volunteerMerchantGetById(@RequestParam("id") String id)
+ {
+ return communityService.volunteerMerchantGetById(id);
+ }
+
+
+ /**
+ * 是否是商家
+ * @return
+ */
+ @GetMapping("/VolunteerMerchant/isMerchant")
+ public R isMerchant(@RequestParam("userId") String userId)
+ {
+ return communityService.isMerchant(userId);
+ }
+
+
+ /**
+ * 社区取消订单
+ * @param id
+ * @return
+ */
+ @GetMapping("/order/communityCancellation")
+ public R communityCancellation(@RequestParam("id") String id)
+ {
+ return communityService.communityCancellation(id);
+ }
+
+ /**
+ * 用户设置积分支付密码
+ * @param userId
+ * @param pwd
+ * @return
+ */
+ @GetMapping("/setUserPlayPwd")
+ public R setUserPlayPwd(@RequestParam("userId") String userId,@RequestParam("pwd") String pwd)
+ {
+ if (StringUtils.isEmpty(userId))
+ {
+ return R.fail("userId不能为空");
+ }
+
+ if(StringUtils.isEmpty(pwd))
+ {
+ return R.fail("密码不能为空");
+ }
+
+ LoginUserInfoVO loginUserInfoVO=new LoginUserInfoVO();
+ loginUserInfoVO.setUserId(Long.valueOf(userId));
+ loginUserInfoVO.setPlayPwd(pwd);
+ return userService.putUser(loginUserInfoVO);
+ }
+
+
+ /**
+ * 判断密码是否正确
+ * @param userId
+ * @param pwd
+ * @return
+ */
+ @GetMapping("/passwordIsCorrect")
+ public R passwordIsCorrect(@RequestParam("userId") String userId,@RequestParam("pwd") String pwd)
+ {
+ if (StringUtils.isEmpty(userId))
+ {
+ return R.fail("userId不能为空");
+ }
+
+ if(StringUtils.isEmpty(pwd))
+ {
+ return R.fail("密码不能为空");
+ }
+ LoginUserInfoVO loginUserInfoVO=userService.getUserInfoByUserId(userId).getData();
+ if(StringUtils.isEmpty(loginUserInfoVO.getPlayPwd()))
+ {
+ return R.fail(304,"您还未设置密码！");
+ }
+
+
+ if(StringUtils.equals(pwd,loginUserInfoVO.getPlayPwd()))
+ {
+ return R.ok();
+ }
+ return R.fail("密码错误");
+ }
+ /****************************************************************************************************************
+ *
+ * 商家评论
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 商家评论分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/evaluate/getList")
+ public R volunteerMerchantGetList(@RequestParam("pageNum") int pageNum,
+ @RequestParam("pageSize") int pageSize,
+ @RequestParam("communityId") String communityId,
+ @RequestParam("merchantId") String merchantId)
+ {
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
+ if(StringUtils.isEmpty(merchantId))
+ {
+ return R.fail("商家id不能为空");
+ }
+ return communityService.volunteerMerchantGetList(pageNum,pageSize,communityId,merchantId);
+ }
+
+ /**
+ * 商家评论获取详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/evaluate/getData")
+ public R volunteerMerchantGetData(@RequestParam("id") String id)
+ {
+ return communityService.volunteerMerchantGetData(id);
+ }
+
+ /**
+ * 商家评论新增评价
+ * @return
+ */
+ @PostMapping("/evaluate/insert")
+ public R volunteerMerchantInsert(@RequestBody VolunteerMerchantEvaluateVO item)
+ {
+ return communityService.volunteerMerchantInsert(item);
+ }
+
+ /**
+ * 商家评论更新评价
+ * @return
+ */
+ @PostMapping("/evaluate/update")
+ public R volunteerMerchantUpdate(@RequestBody VolunteerMerchantEvaluateVO item)
+ {
+ return communityService.volunteerMerchantUpdate(item);
+ }
-
+ /**
+ * 商家评论删除评价
+ * @param id
+ * @return
+ */
+ @DeleteMapping("/evaluate/delete")
+ public R volunteerMerchantDelete(@RequestParam("id") String id)
+ {
+ return communityService.volunteerMerchantDelete(id);
+ }
--
Gitblit v1.7.1