From 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d Mon Sep 17 00:00:00 2001
From: hhhyyq <hhhyyq@163.com>
Date: 星期三, 17 三月 2021 00:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 50 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
new file mode 100644
index 0000000..bc65633
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java
@@ -0,0 +1,50 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
+import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComCvtBusinessDetailVO;
+import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
+import com.panzhihua.common.service.community.CommunityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @description: 社区便民服务商家接口
+ * @author: Null
+ * @date: 2021/3/11 13:26
+ */
+@Slf4j
+@Api(tags = {"社区运营/便民服务"})
+@RestController
+@RequestMapping("/convenient")
+public class CommunityConvenientApi extends BaseController {
+
+    @Resource
+    private CommunityService communityService;
+
+    @ApiOperation(value = "分页查询便民服务商家",response = ComCvtBusinessVO.class)
+    @PostMapping("/business/area/page")
+    public R pageComCvtBusiness(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+        Long communityId = loginUserInfo.getCommunityId();
+        if (null!=communityId && 0!=communityId) {
+            comCvtBusinessAppletsDTO.setCommunityId(communityId);
+        }
+        return communityService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
+    }
+
+
+    @ApiOperation(value = "查询便民服务商家详情",response = ComCvtBusinessDetailVO.class)
+    @GetMapping("/business/get")
+    public R getComCvtBusinessServeDetail(@RequestParam("id") Long id) {
+        return communityService.getComCvtBusinessServeDetail(id);
+    }
+
+}

--
Gitblit v1.7.1