From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/api/StoreAdsApi.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/StoreAdsApi.java b/service-store/src/main/java/com/java110/store/api/StoreAdsApi.java
index 01fa560..948716e 100644
--- a/service-store/src/main/java/com/java110/store/api/StoreAdsApi.java
+++ b/service-store/src/main/java/com/java110/store/api/StoreAdsApi.java
@@ -1,8 +1,8 @@
package com.java110.store.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.storeAds.StoreAdsDto;
-import com.java110.po.storeAds.StoreAdsPo;
+import com.java110.dto.store.StoreAdsDto;
+import com.java110.po.store.StoreAdsPo;
import com.java110.store.bmo.storeAds.IDeleteStoreAdsBMO;
import com.java110.store.bmo.storeAds.IGetStoreAdsBMO;
import com.java110.store.bmo.storeAds.ISaveStoreAdsBMO;
@@ -70,7 +70,6 @@
Assert.hasKeyAndValue(reqJson, "url", "璇锋眰鎶ユ枃涓湭鍖呭惈url");
Assert.hasKeyAndValue(reqJson, "adsId", "adsId涓嶈兘涓虹┖");
-
StoreAdsPo storeAdsPo = BeanConvertUtil.covertBean(reqJson, StoreAdsPo.class);
return updateStoreAdsBMOImpl.update(storeAdsPo);
}
@@ -85,11 +84,8 @@
*/
@RequestMapping(value = "/deleteStoreAds", method = RequestMethod.POST)
public ResponseEntity<String> deleteStoreAds(@RequestBody JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
-
+// Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "adsId", "adsId涓嶈兘涓虹┖");
-
-
StoreAdsPo storeAdsPo = BeanConvertUtil.covertBean(reqJson, StoreAdsPo.class);
return deleteStoreAdsBMOImpl.delete(storeAdsPo);
}
@@ -103,13 +99,19 @@
* @path /app/storeAds/queryStoreAds
*/
@RequestMapping(value = "/queryStoreAds", method = RequestMethod.GET)
- public ResponseEntity<String> queryStoreAds(@RequestParam(value = "communityId") String shareId,
+ public ResponseEntity<String> queryStoreAds(@RequestParam(value = "shareId", required = false) String shareId,
+ @RequestParam(value = "adName", required = false) String adName,
+ @RequestParam(value = "adType", required = false) String adType,
+ @RequestParam(value = "advertType", required = false) String advertType,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
StoreAdsDto storeAdsDto = new StoreAdsDto();
storeAdsDto.setPage(page);
storeAdsDto.setRow(row);
storeAdsDto.setShareId(shareId);
+ storeAdsDto.setAdName(adName);
+ storeAdsDto.setAdType(adType);
+ storeAdsDto.setAdvertType(advertType);
return getStoreAdsBMOImpl.get(storeAdsDto);
}
}
--
Gitblit v1.8.0