From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能
---
service-user/src/main/java/com/java110/user/api/OwnerApi.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/OwnerApi.java b/service-user/src/main/java/com/java110/user/api/OwnerApi.java
old mode 100644
new mode 100755
index 634de1d..29a68b2
--- a/service-user/src/main/java/com/java110/user/api/OwnerApi.java
+++ b/service-user/src/main/java/com/java110/user/api/OwnerApi.java
@@ -1,11 +1,9 @@
package com.java110.user.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.owner.OwnerDto;
import com.java110.po.owner.OwnerPo;
-import com.java110.user.bmo.owner.IChangeOwnerPhone;
-import com.java110.user.bmo.owner.IComprehensiveQuery;
-import com.java110.user.bmo.owner.IQueryTenants;
-import com.java110.user.bmo.owner.IVisitorRecord;
+import com.java110.user.bmo.owner.*;
import com.java110.utils.util.Assert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -27,6 +25,9 @@
@Autowired
private IComprehensiveQuery comprehensiveQueryImpl;
+
+ @Autowired
+ private IQueryShopsHireLog queryShopsHireLogImpl;
@RequestMapping(value = "/tenants")
public ResponseEntity<String> tenants(@RequestBody JSONObject reqJson) {
@@ -75,7 +76,29 @@
public ResponseEntity<String> comprehensiveQuery(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "searchValue") String searchValue,
@RequestParam(value = "searchType") String searchType,
- @RequestHeader(value = "user-id") String userId) {
- return comprehensiveQueryImpl.query(communityId, searchValue, searchType,userId);
+ @RequestHeader(value = "user-id") String userId,
+ @RequestHeader(value = "store-id") String storeId) {
+ return comprehensiveQueryImpl.query(communityId, searchValue, searchType, userId,storeId);
+ }
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /ownerApi/queryShopsHireLog
+ * @path /app/ownerApi/queryShopsHireLog
+ */
+ @RequestMapping(value = "/queryShopsHireLog", method = RequestMethod.GET)
+ public ResponseEntity<String> queryShopsHireLog(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "roomId") String roomId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setPage(page);
+ ownerDto.setRow(row);
+ ownerDto.setCommunityId(communityId);
+ ownerDto.setRoomId(roomId);
+ return queryShopsHireLogImpl.query(ownerDto);
}
}
--
Gitblit v1.8.0