From 0a18a8cb0a7a57bf1f82df425251334c57f8c39a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 一月 2021 15:40:37 +0800
Subject: [PATCH] 新增手机号/qq/微信绑定

---
 src/main/java/com/yeshi/buwan/service/imp/shop/ShopService.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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..6096ac7 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) {

--
Gitblit v1.8.0