From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityConvenientApi.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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
index 655ad46..ae9d382 100644
--- 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
@@ -1,18 +1,20 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
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: 社区便民服务商家接口
@@ -28,19 +30,17 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询便民服务商家",response = ComCvtBusinessVO.class)
+ @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);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
+ if (loginUserInfo != null) {
+ comCvtBusinessAppletsDTO.setCommunityId(loginUserInfo.getCommunityId());
}
return communityService.pageComCvtBusinessByServiceArea(comCvtBusinessAppletsDTO);
}
-
- @ApiOperation(value = "查询便民服务商家详情")
+ @ApiOperation(value = "查询便民服务商家详情", response = ComCvtBusinessDetailVO.class)
@GetMapping("/business/get")
public R getComCvtBusinessServeDetail(@RequestParam("id") Long id) {
return communityService.getComCvtBusinessServeDetail(id);
--
Gitblit v1.7.1