From d99a56e37cf9109b46ee68d34a06594ef5615ed3 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 16:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ConvenientApi.java | 245 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 212 insertions(+), 33 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 78af34d..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
@@ -1,13 +1,13 @@
package com.panzhihua.service_community.api;
+import java.time.Instant;
import java.util.List;
import javax.annotation.Resource;
import javax.validation.Valid;
-import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PageMerchantProductDTO;
-import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+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;
@@ -24,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;
@@ -79,6 +60,12 @@
@Resource
private ConvenientProductService convenientProductService;
+
+ @Resource
+ private ConvenientElevatingPointService convenientElevatingPointService;
+
+ @Resource
+ private ConvenientGoodsCategoryService convenientGoodsCategoryService;
/**
* 社区后台分页查询便民服务商家
@@ -387,7 +374,7 @@
}
/**
- * 分页查询便民服务商家
+ * 分页查询便民服务商家 运营后台
* @param pageConvenientMerchantDTO
* @return
*/
@@ -431,8 +418,8 @@
* @return
*/
@GetMapping("/service-category/all")
- public R getAllServiceCategories() {
- return convenientServiceCategoryService.getAllServiceCategories();
+ public R getAllServiceCategories(@RequestParam("areaCode") String areaCode) {
+ return convenientServiceCategoryService.getAllServiceCategories(areaCode);
}
/**
@@ -569,10 +556,11 @@
/**
* 获取所有产品分类
* @return
+ * @param merchantId
*/
@GetMapping("/product-category/all")
- public R getAllProductCategory() {
- return convenientProductCategoryService.getAllProductCategory();
+ public R getAllProductCategory(@RequestParam("merchantId") Long merchantId) {
+ return convenientProductCategoryService.getAllProductCategory(merchantId);
}
/**
@@ -581,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);
}
/**
@@ -617,11 +605,202 @@
/**
* 小程序获取商家产品
- * @param pageMerchantProductDTO
+ * @param merchantId
* @return
*/
- @PostMapping("/merchant/product")
- public R getMerchantProduct(@RequestBody PageMerchantProductDTO pageMerchantProductDTO) {
- return convenientProductService.getMerchantProduct(pageMerchantProductDTO);
+ @GetMapping("/product/list")
+ public R getMerchantProduct(@RequestParam("merchantId") Long merchantId) {
+ return convenientProductService.getMerchantProduct(merchantId);
+ }
+
+ /**
+ * 获取产品详情
+ * @param productId
+ * @return
+ */
+ @GetMapping("/product/detail")
+ public R getProductDetail(@RequestParam("productId") Long productId) {
+ return convenientProductService.getProduct(productId);
+ }
+
+ /**
+ * 搜索商家信息
+ * @param pageSearchDTO
+ * @return
+ */
+ @PostMapping("/merchant/search")
+ public R pageSearchMerchant(@RequestBody PageSearchDTO pageSearchDTO) {
+ return convenientMerchantService.pageSearchMerchant(pageSearchDTO);
+ }
+
+ /**
+ * 搜索商品信息
+ * @param pageSearchDTO
+ * @return
+ */
+ @PostMapping("/product/search")
+ public R pageSearchProduct(@RequestBody PageSearchDTO pageSearchDTO) {
+ return convenientProductService.pageSearchProduct(pageSearchDTO);
+ }
+
+ /**
+ * 增加商家店铺咨询量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/merchant/consult")
+ public R consultMerchant(@RequestParam("merchantId") Long merchantId) {
+ return convenientMerchantService.consultMerchant(merchantId);
+ }
+
+ /**
+ * 增加商家店铺浏览量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/merchant/incr-view")
+ public R incrMerchantView(@RequestParam("merchantId") Long merchantId) {
+ return convenientMerchantService.incrMerchantView(merchantId);
+ }
+
+ /**
+ * 增加产品浏览量
+ * @param productId
+ * @return
+ */
+ @GetMapping("/product/incr-view")
+ public R incrProductView(@RequestParam("productId") Long productId) {
+ return convenientProductService.incrProductView(productId);
+ }
+
+ /**
+ * 获取商家导出数据
+ * @param exportMerchantDTO
+ * @return
+ */
+ @PostMapping("/merchant/export")
+ public R exportMerchant(@RequestBody ExportMerchantDTO exportMerchantDTO) {
+ return convenientMerchantService.exportMerchant(exportMerchantDTO);
+ }
+
+ /**
+ * 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
+ * @return
+ */
+ @PostMapping("/timedTaskWriteDataToMerchantJobHandler")
+ public R timedTaskWriteDataToMerchantJobHandler() {
+ return convenientMerchantService.timedTaskWriteDataToMerchantJobHandler();
+ }
+
+ /**
+ * 获取商家上下架产品数量
+ * @param merchantId
+ * @return
+ */
+ @GetMapping("/product/shelf-num")
+ 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