|
@@ -4,30 +4,16 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.miekir.shibei.bean.ResponseResult;
|
|
import com.miekir.shibei.bean.ResponseResult;
|
|
|
import com.miekir.shibei.bean.ResultCode;
|
|
import com.miekir.shibei.bean.ResultCode;
|
|
|
import com.miekir.shibei.bean.db.*;
|
|
import com.miekir.shibei.bean.db.*;
|
|
|
-import com.miekir.shibei.constants.ServerConstants;
|
|
|
|
|
import com.miekir.shibei.repository.*;
|
|
import com.miekir.shibei.repository.*;
|
|
|
import com.miekir.shibei.tool.RequestTool;
|
|
import com.miekir.shibei.tool.RequestTool;
|
|
|
-import com.miekir.shibei.tool.email.EmailTool;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.data.domain.PageRequest;
|
|
|
|
|
-import org.springframework.data.domain.Sort;
|
|
|
|
|
import org.springframework.http.HttpHeaders;
|
|
import org.springframework.http.HttpHeaders;
|
|
|
-import org.springframework.http.HttpStatus;
|
|
|
|
|
-import org.springframework.http.ResponseEntity;
|
|
|
|
|
import org.springframework.stereotype.Controller;
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.RequestHeader;
|
|
import org.springframework.web.bind.annotation.RequestHeader;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
|
|
-import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
-import java.io.File;
|
|
|
|
|
-import java.io.FileInputStream;
|
|
|
|
|
-import java.io.IOException;
|
|
|
|
|
-import java.io.InputStream;
|
|
|
|
|
-import java.math.BigInteger;
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.Iterator;
|
|
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
@@ -135,7 +121,7 @@ public class FavController {
|
|
|
}
|
|
}
|
|
|
}*/
|
|
}*/
|
|
|
// 保持原生顺序。使用jpa的findAll总是会自动排序
|
|
// 保持原生顺序。使用jpa的findAll总是会自动排序
|
|
|
- List<GoodsBean> goodsBeanList = goodsRepository.findByIdsIn(email, pageNum*pageSize, pageSize);
|
|
|
|
|
|
|
+ List<GoodsBean> goodsBeanList = goodsRepository.findGoodsByIds(email, pageNum*pageSize, pageSize);
|
|
|
List<Long> favBeanList = favRepository.findFavListByEmail(email);
|
|
List<Long> favBeanList = favRepository.findFavListByEmail(email);
|
|
|
// 当前商品是否已收藏
|
|
// 当前商品是否已收藏
|
|
|
for (GoodsBean goodsBean : goodsBeanList) {
|
|
for (GoodsBean goodsBean : goodsBeanList) {
|