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 |  191 +++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 182 insertions(+), 9 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 0cbf30c..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,13 +1,11 @@
 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.*;
 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.entity.VolunteerCommunityConfig;
+import com.panzhihua.service_community.service.*;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -109,10 +107,10 @@
      * @return
      */
     @GetMapping("/evaluate/getList")
-    public R volunteerMerchantGetList(@RequestParam("userId") int pageNum,
-                     @RequestParam("userId") int pageSize,
-                     @RequestParam("communityId") String communityId,
-                     @RequestParam("merchantId") String merchantId)
+    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);
     }
@@ -161,4 +159,179 @@
     }
 
 
+    /***************************************************************************************************************
+     *
+     *                               路北社区商家提现
+     *
+     ****************************************************************************************************************/
+
+    @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