From 987d3d6f0a4212c553b610882ebc6e22a225c6e7 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期六, 18 九月 2021 18:16:38 +0800
Subject: [PATCH] 便民服务
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 181 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 179 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
index 6c6289a..3124ebb 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java
@@ -5,9 +5,31 @@
import javax.annotation.Resource;
import javax.validation.Valid;
-import org.springframework.web.bind.annotation.*;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
+import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
+import com.panzhihua.service_community.service.ConvenientMerchantService;
+import com.panzhihua.service_community.service.ConvenientServiceCategoryService;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
-import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.service_community.service.ComCvtBusinessService;
@@ -34,6 +56,12 @@
@Resource
private ComCvtServeService comCvtServeService;
+
+ @Resource
+ private ConvenientServiceCategoryService convenientServiceCategoryService;
+
+ @Resource
+ private ConvenientMerchantService convenientMerchantService;
/**
* 社区后台分页查询便民服务商家
@@ -260,4 +288,153 @@
@RequestParam(value = "communityId", required = false) Long communityId) {
return comCvtServeService.listSaveConvenientServeExcelVO(list, communityId);
}
+
+ /**
+ * 便民服务新增分类
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/service-category/add")
+ public R addServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO) {
+ return convenientServiceCategoryService.addServiceCategory(convenientServiceCategoryDTO);
+ }
+
+ /**
+ * 便民服务分类编辑
+ * @param convenientServiceCategoryDTO
+ * @return
+ */
+ @PutMapping("/service-category/put")
+ public R putServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO) {
+ return convenientServiceCategoryService.putServiceCategory(convenientServiceCategoryDTO);
+ }
+
+ /**
+ * 便民服务分类删除
+ * @param categoryId
+ * @return
+ */
+ @DeleteMapping("/service-category/delete")
+ public R deleteServiceCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator) {
+ return convenientServiceCategoryService.deleteServiceCategoryById(categoryId, operator);
+ }
+
+ /**
+ * 获取便民服务分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/service-category/get")
+ public R getServiceCategory(@RequestParam("categoryId") Long categoryId) {
+ return convenientServiceCategoryService.getServiceCategoryById(categoryId);
+ }
+
+ /**
+ * 分页查询便民服务分类
+ * @param pageConvenientServiceCategoryDTO
+ * @return
+ */
+ @PostMapping("/service-category/page")
+ public R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO) {
+ return convenientServiceCategoryService.pageServiceCategory(pageConvenientServiceCategoryDTO);
+ }
+
+ /**
+ * 便民服务新增商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/merchant/add")
+ public R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
+ return convenientMerchantService.addMerchant(convenientMerchantDTO);
+ }
+
+ /**
+ * 编辑便民服务商家
+ * @param convenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/merchant/put")
+ public R putMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO) {
+ return convenientMerchantService.putMerchant(convenientMerchantDTO);
+ }
+
+ /**
+ * 删除便民服务商家
+ * @param merchantId
+ * @return
+ */
+ @DeleteMapping("/merchant/delete")
+ public R deleteMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("operator") Long operator) {
+ return convenientMerchantService.deleteMerchant(merchantId, operator);
+ }
+
+ /**
+ * 分页查询便民服务商家
+ * @param pageConvenientMerchantDTO
+ * @return
+ */
+ @PostMapping("/merchant/page")
+ public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
+ return convenientMerchantService.pageMerchant(pageConvenientMerchantDTO);
+ }
+
+ /**
+ * 获取便民服务商家详情
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/merchant/get")
+ public R getMerchant(@RequestParam("merchantId") Long merchantId) {
+ return convenientMerchantService.getMerchant(merchantId);
+ }
+
+ /**
+ * 禁用/启用便民服务商家
+ * @param disableOrEnableConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/merchant/disable-or-enable")
+ public R disableOrEnableMerchant(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
+ return convenientMerchantService.disableOrEnableMerchant(disableOrEnableConvenientMerchantDTO);
+ }
+
+ /**
+ * 重置便民服务商家账号密码
+ * @param resetPasswordConvenientMerchantDTO
+ * @return
+ */
+ @PutMapping("/merchant/reset-password")
+ public R resetPasswordMerchant(@RequestBody ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO) {
+ return convenientMerchantService.resetPasswordMerchant(resetPasswordConvenientMerchantDTO);
+ }
+
+ /**
+ * 获取所有便民服务分类
+ * @return
+ */
+ @GetMapping("/service-category/all")
+ public R getAllServiceCategories() {
+ return convenientServiceCategoryService.getAllServiceCategories();
+ }
+
+ /**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ @GetMapping("/getUserMerchantInfoByAccount")
+ public R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account) {
+ return convenientMerchantService.getUserMerchantInfoByAccount(account);
+ }
+
+ /**
+ * 获取商便民服务商家信息
+ * @param userId
+ * @return
+ */
+ @GetMapping("/merchantInfo")
+ public R<ConvenientMerchantVO> getUserConvenientMerchantInfo(@RequestParam("userId") Long userId) {
+ return convenientMerchantService.getUserConvenientMerchantInfo(userId);
+ }
}
--
Gitblit v1.7.1