From 29e6855302b602f8dc3fac25c5e123d2646cf552 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 06 九月 2023 14:53:57 +0800
Subject: [PATCH] 新增社区商家模块系统配置
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/XmostBeautifulApi.java | 194 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 191 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 529483e..1fad699 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,6 +4,9 @@
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.model.vos.community.VolunteerMerchantWithdrawVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.StringUtils;
@@ -96,14 +99,15 @@
@RequestParam(value = "condition", required = false) String condition,
@RequestParam(value = "userName", required = false) String userName,
@RequestParam(value = "communityId", required = false) String communityId,
- @RequestParam(value = "orderType", required = false) String orderType)
+ @RequestParam(value = "orderType", required = false) String orderType,
+ @RequestParam(value = "merchantId", required = false) String merchantId)
{
if(StringUtils.isEmpty(communityId))
{
communityId=getCommunityId()+"";
}
return communityService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
- condition,userName,communityId,getUserId()+"",orderType);
+ condition,userName,communityId,getUserId()+"",orderType,merchantId);
}
/**
@@ -134,7 +138,7 @@
/**
- * 更新商家
+ * 更新商家订单
* @param item
* @return
*/
@@ -253,6 +257,16 @@
return communityService.volunteerTypeGetList(pageNum,pageSize,"2");
}
+ /**
+ * 修改商家
+ * @param vtvo
+ * @return
+ */
+ @PostMapping("/VolunteerMerchant/update")
+ public R updateVolunteerMerchant(@RequestBody VolunteerMerchantVO vtvo)
+ {
+ return communityService.updateVolunteerMerchant(vtvo);
+ }
/**
* 获取商家详情
@@ -333,6 +347,12 @@
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();
@@ -341,4 +361,172 @@
}
+
+
+ /****************************************************************************************************************
+ *
+ * 商家评论
+ *
+ ***************************************************************************************************************/
+
+ /**
+ * 商家评论分页查询
+ * @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)
+ {
+ if(item==null)
+ {
+ return R.fail("参数不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getCommunityId()))
+ {
+ item.setCommunityId(getCommunityId()+"");
+ }
+
+ if(StringUtils.isEmpty(item.getMerchantId()))
+ {
+ return R.fail("商家id不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getOrderId()))
+ {
+ return R.fail("订单id不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getUserId()))
+ {
+ return R.fail("评论人id不能为空");
+ }
+
+ if(StringUtils.isEmpty(item.getEvaluateGrade()))
+ {
+ return R.fail("评论分数不能为空");
+ }
+
+ 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);
+ }
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区商家提现
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 新增商家提现
+ * @param item
+ * @return
+ */
+ @PostMapping("/withdraw/insert")
+ public R WithdrawInsert(@RequestBody VolunteerMerchantWithdrawVO item)
+ {
+ return communityService.WithdrawInsert(item);
+ }
+
+ /**
+ * 商家提现列表
+ * @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,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "communityId", required = false) String communityId)
+ {
+ if(StringUtils.isEmpty(communityId))
+ {
+ communityId=getCommunityId()+"";
+ }
+
+ if(StringUtils.isEmpty(merchantId))
+ {
+ return R.fail("商家id不能为空");
+ }
+
+ return communityService.WithdrawGetList(pageNum,pageSize,disposeType, merchantName,merchantId,communityId);
+ }
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId)
+ {
+ return communityService.ConfiggetData(communityId);
+ }
+
+
+
+
}
--
Gitblit v1.7.1