From 7a8e31ceb01c7eb27d90197ec91efdfce4bedb41 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 16 十一月 2022 18:00:39 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 137 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 112 insertions(+), 25 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 f8e3781..5651b3b 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
@@ -6,10 +6,8 @@
import javax.annotation.Resource;
import javax.validation.Valid;
-import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
+import com.panzhihua.common.model.dtos.community.convenient.*;
+import com.panzhihua.service_community.service.*;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -26,28 +24,9 @@
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.ConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
-import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
-import com.panzhihua.service_community.service.ComCvtBusinessService;
-import com.panzhihua.service_community.service.ComCvtCategoryService;
-import com.panzhihua.service_community.service.ComCvtServeService;
-import com.panzhihua.service_community.service.ConvenientMerchantService;
-import com.panzhihua.service_community.service.ConvenientProductCategoryService;
-import com.panzhihua.service_community.service.ConvenientProductService;
-import com.panzhihua.service_community.service.ConvenientServiceCategoryService;
import lombok.extern.slf4j.Slf4j;
@@ -81,6 +60,12 @@
@Resource
private ConvenientProductService convenientProductService;
+
+ @Resource
+ private ConvenientElevatingPointService convenientElevatingPointService;
+
+ @Resource
+ private ConvenientGoodsCategoryService convenientGoodsCategoryService;
/**
* 社区后台分页查询便民服务商家
@@ -584,8 +569,8 @@
* @return
*/
@GetMapping("/service-category/suitable")
- public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId) {
- return convenientServiceCategoryService.getSuitableServiceCategories(communityId);
+ public R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode) {
+ return convenientServiceCategoryService.getSuitableServiceCategories(communityId,areaCode);
}
/**
@@ -716,4 +701,106 @@
public R getProductShelfNum(@RequestParam("merchantId") Long merchantId) {
return convenientProductService.getProductShelfNum(merchantId);
}
+
+
+ /**
+ * 分页查询自提点 运营后台
+ * @param pageConvenientElevatingPointDTO
+ * @return
+ */
+ @PostMapping("/point/page")
+ public R pagePoint(@RequestBody PageConvenientElevatingPointDTO pageConvenientElevatingPointDTO) {
+ return convenientElevatingPointService.pagePoint(pageConvenientElevatingPointDTO);
+ }
+
+ /**
+ * 便民服务新增 自提点
+ * @param convenientElevatingPointDTO
+ * @return
+ */
+ @PostMapping("/point/add")
+ public R addPoint(@RequestBody ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+ return convenientElevatingPointService.addPoint(convenientElevatingPointDTO);
+ }
+
+ /**
+ * 编辑便民服务 自提点
+ * @param convenientElevatingPointDTO
+ * @return
+ */
+ @PutMapping("/point/put")
+ public R putPoint(@RequestBody ConvenientElevatingPointDTO convenientElevatingPointDTO) {
+ return convenientElevatingPointService.putPoint(convenientElevatingPointDTO);
+ }
+
+ /**
+ * 删除便民服务 自提点
+ * @param pointId
+ * @param operator
+ * @return
+ */
+ @DeleteMapping("/point/delete")
+ public R deletePoint(@RequestParam("pointId") Long pointId, @RequestParam("operator") Long operator) {
+ return convenientElevatingPointService.deletePoint(pointId,operator);
+ }
+
+ /**
+ * 便民服务详情 自提点
+ * @param pointId
+ * @return
+ */
+ @GetMapping("/point/detail")
+ public R detailPoint(@RequestParam("pointId") Long pointId) {
+ return convenientElevatingPointService.detailPoint(pointId);
+ }
+
+ /**
+ * 新增商品分类
+ * @param convenientGoodsCategoryDTO
+ * @return
+ */
+ @PostMapping("/goodsCategory/add")
+ public R addGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) {
+ return convenientGoodsCategoryService.addGoodsCategory(convenientGoodsCategoryDTO);
+ }
+
+ /**
+ * 编辑
+ * @param convenientGoodsCategoryDTO
+ * @return
+ */
+ @PutMapping("/goodsCategory/put")
+ public R putGoodsCategory(@RequestBody ConvenientGoodsCategoryDTO convenientGoodsCategoryDTO) {
+ return convenientGoodsCategoryService.putGoodsCategory(convenientGoodsCategoryDTO);
+ }
+
+ /**
+ * 删除商品分类
+ * @param categoryId
+ * @return
+ */
+ @DeleteMapping("/goodsCategory/delete")
+ public R deleteGoodsCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator) {
+ return convenientGoodsCategoryService.deleteGoodsCategoryById(categoryId, operator);
+ }
+
+ /**
+ * 获取商品分类详情
+ * @param categoryId
+ * @return
+ */
+ @GetMapping("/goodsCategory/get")
+ public R getGoodsCategory(@RequestParam("categoryId") Long categoryId) {
+ return convenientGoodsCategoryService.getGoodsCategoryById(categoryId);
+ }
+
+ /**
+ * 分页查询商品分类
+ * @param pageConvenientGoodsCategoryDTO
+ * @return
+ */
+ @PostMapping("/goodsCategory/page")
+ public R pageGoodsCategory(@RequestBody PageConvenientGoodsCategoryDTO pageConvenientGoodsCategoryDTO) {
+ return convenientGoodsCategoryService.pageGoodsCategory(pageConvenientGoodsCategoryDTO);
+ }
}
--
Gitblit v1.7.1