From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerMerchantApi.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 108 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 d4dd96e..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,15 +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.VolunteerMerchantWithdrawVO;
+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.service.VolunteerMerchantWithdrawService;
+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;
@@ -182,9 +178,11 @@
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 = "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);
+ return vmwService.getList(pageNum,pageSize,disposeType,merchantName,merchantId,communityId);
}
/**
@@ -233,6 +231,107 @@
+ /***************************************************************************************************************
+ *
+ * 路北社区系统配置 商家折扣 兑换地点信息
+ *
+ ****************************************************************************************************************/
+
+ @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