|
|
@@ -1,6 +1,8 @@
|
|
|
package com.uas.platform.b2c.common.search.controller;
|
|
|
|
|
|
+import com.uas.platform.b2c.common.account.model.User;
|
|
|
import com.uas.platform.b2c.common.search.service.SearcherService;
|
|
|
+import com.uas.platform.b2c.core.support.SystemSession;
|
|
|
import com.uas.platform.b2c.prod.commodity.service.GoodsService;
|
|
|
import com.uas.platform.b2c.prod.store.model.StoreIn;
|
|
|
import com.uas.platform.b2c.prod.store.service.StoreInService;
|
|
|
@@ -305,7 +307,9 @@ public class SearcherController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/stores", method = RequestMethod.GET, params = "op=pageByType")
|
|
|
@ResponseBody
|
|
|
- public List<Map<String, Object>> pageStoresByTypesAndKeyword(PageParams params, String types, @RequestParam(required = false) String keyword) {
|
|
|
+ public List<Map<String, Object>> pageStoresByTypesAndKeyword(PageParams params, String types,HttpServletRequest request, @RequestParam(required = false) String keyword) {
|
|
|
+ User user = (User)request.getSession().getAttribute("user");
|
|
|
+ SystemSession.setUser(user);
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
Page<StoreIn> stores = storeService.pageStoresByTypesAndKeyword(pageInfo, types, keyword);
|
|
|
List<Map<String, Object>> result = new ArrayList<>();
|
|
|
@@ -313,23 +317,15 @@ public class SearcherController {
|
|
|
a.put("stores",stores);
|
|
|
result.add(a);
|
|
|
Map<String, Object> b = new HashedMap();
|
|
|
- Map<String, Object> c = new HashedMap();
|
|
|
ArrayList<String> flag = new ArrayList<>();
|
|
|
ArrayList<Object> flag2 = new ArrayList<>();
|
|
|
b.put("isFocus",flag);
|
|
|
b.put("image",flag2);
|
|
|
result.add(b);
|
|
|
for (StoreIn storeIn : stores){
|
|
|
- if ("true".equals(storeFocusService.storeIfFocus(storeIn.getId()))){
|
|
|
- flag.add("true");
|
|
|
- }else{
|
|
|
- flag.add("false");
|
|
|
- }
|
|
|
+ flag.add(storeFocusService.storeIfFocus(storeIn.getId()));
|
|
|
flag2.add(goodsService.pageCommoditiesByEnInfos(storeIn.getUuid(),null,null,new PageInfo(1,4)));
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
return result;
|
|
|
}
|
|
|
|