From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽

---
 src/main/java/com/yeshi/buwan/service/imp/shop/ShopService.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/shop/ShopService.java b/src/main/java/com/yeshi/buwan/service/imp/shop/ShopService.java
index 4c5202b..e951168 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/shop/ShopService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/shop/ShopService.java
@@ -18,10 +18,10 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import com.yeshi.buwan.dao.LoginUserDao;
+import com.yeshi.buwan.dao.user.LoginUserDao;
 import com.yeshi.buwan.dao.shop.ShopItemCollectDao;
 import com.yeshi.buwan.dao.shop.ShopItemCommentDao;
-import com.yeshi.buwan.domain.LoginUser;
+import com.yeshi.buwan.domain.user.LoginUser;
 import com.yeshi.buwan.domain.entity.ReturnResult;
 import com.yeshi.buwan.domain.shop.ShopGoodsItem;
 import com.yeshi.buwan.domain.shop.ShopItemCollect;
@@ -37,7 +37,7 @@
 
 @Service
 public class ShopService {
-	final static String HOST = "http://buwantb.yeshitv.com:8080/TaoBaoKe/";// 10.251.33.117
+	final static String HOST = "http://111.231.250.166:8087//TaoBaoKe/";// 10.251.33.117
 
 	// private static final String HOST ="http://192.168.1.200:8088/TaoBaoKe/";
 	@Resource
@@ -49,13 +49,12 @@
 	@Resource
 	private ShopItemCommentDao shopItemCommentDao;
 
-	@Cacheable(value = "shopCache", key = "'getItemList-'+#page")
 	private String getItemList(int page) {
 		return HttpUtil.get(HOST + "api/buwan/itemlist?page=" + page, "ISO-8859-1");
 	}
 
 	public List<ShopGoodsItem> getGoodsList(final String uid, int page) {
-		final List<ShopGoodsItem> list = new ArrayList<ShopGoodsItem>();
+		final List<ShopGoodsItem> list = new ArrayList<>();
 		String result = getItemList(page);
 		System.out.println(result);
 
@@ -99,7 +98,7 @@
 	}
 
 	public ReturnResult getGoodsListAdmin(int page, String key, int show) {
-		final List<ShopGoodsItem> list = new ArrayList<ShopGoodsItem>();
+		final List<ShopGoodsItem> list = new ArrayList<>();
 		String result = "";
 		try {
 			result = HttpUtil.get(String.format(HOST + "api/buwan/admin/itemlist?page=%s&show=%s&key=%s", page + "",
@@ -160,7 +159,7 @@
 
 	@Cacheable(value = "shopCache", key = "'getGoodsSimpleDetail-'+#md5")
 	public List<ShopGoodsItem> getGoodsSimpleDetail(long[] ids, String md5) {
-		List<ShopGoodsItem> list = new ArrayList<ShopGoodsItem>();
+		List<ShopGoodsItem> list = new ArrayList<>();
 		Gson gson = new GsonBuilder().create();
 		String idStr = "";
 		for (long id : ids) {
@@ -228,7 +227,6 @@
 						return true;
 					}
 				} catch (Exception e) {
-					if (session.getTransaction().isActive())
 						session.getTransaction().rollback();
 				}
 				return false;

--
Gitblit v1.8.0