From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 272 insertions(+), 6 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..fa91ef1 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,8 +1,10 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
-import com.panzhihua.service_community.service.VolunteerMerchantService;
+import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.utlis.StringUtils;
+import com.panzhihua.service_community.entity.VolunteerCommunityConfig;
+import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -17,13 +19,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 +71,267 @@
@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,
+ @RequestParam(value = "merchantId", required = false) String merchantId,
+ @RequestParam(value = "communityId", required = false) String communityId)
+ {
+ return vmwService.getList(pageNum,pageSize,disposeType,merchantName,merchantId,communityId);
+ }
+
+ /**
+ * 新增商家提现
+ * @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);
+ }
+
+
+
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ @Resource
+ private VolunteerCommunityConfigService vccService;
+
+ /**
+ * 详情
+ * @param
+ * @return
+ */
+ @GetMapping("/Community/Config/getData")
+ public R ConfiggetData(@RequestParam("communityId") String communityId)
+ {
+ return vccService.getData(communityId);
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/Community/Config/insertvo")
+ public R Configinsertvo(@RequestBody VolunteerCommunityConfigVO item)
+ {
+ R<VolunteerCommunityConfig> voR=vccService.getData(item.getCommunityId());
+ if(voR.getData()==null || StringUtils.isEmpty(voR.getData().getCommunityId()))
+ {
+ return vccService.insertvo(item);
+ }
+ else
+ {
+ return vccService.update(item);
+ }
+ }
+
+ /*******************************************************************************************************************
+ *
+ *
+ * 社区折扣
+ *
+ *
+ ******************************************************************************************************************/
+
+ @Resource
+ private VolunteerCommunityDiscountService vcdService;
+
+ /**
+ * 分页查询
+ * @param
+ * @return
+ */
+ @GetMapping("/community/discount/getList")
+ public R CommunityDiscountgetList(@RequestParam("communityId") String communityId)
+ {
+ return R.ok(vcdService.getList(communityId));
+ }
+
+ /**
+ * 新增
+ * @param
+ * @return
+ */
+ @PostMapping("/community/discount/insert")
+ public R CommunityDiscountinsert(@RequestBody VolunteerCommunityDiscountVO item)
+ {
+ int num= vcdService.insert(item);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("操作失败");
+ }
+
+
+ @PostMapping("/community/discount/update")
+ public R CommunityDiscountupdate(@RequestBody VolunteerCommunityDiscountVO item)
+ {
+ int num= vcdService.update(item);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("操作失败");
+ }
+
+
+ @DeleteMapping("/community/discount/delete")
+ public R CommunityDiscountdelete(@RequestParam("id") String id)
+ {
+ int num= vcdService.delete(id);
+ if(num>0)
+ {
+ return R.ok();
+ }
+ return R.fail("操作失败");
+ }
+
+
}
--
Gitblit v1.7.1