From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容
---
src/main/java/com/yeshi/buwan/service/imp/shop/ShopService.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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..9c45a5f 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;
@@ -55,7 +55,7 @@
}
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 +99,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 +160,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 +228,6 @@
return true;
}
} catch (Exception e) {
- if (session.getTransaction().isActive())
session.getTransaction().rollback();
}
return false;
--
Gitblit v1.8.0