|
@@ -8,7 +8,6 @@ import com.caimei.entity.CmMallProductLadderPrice;
|
|
|
import com.caimei.entity.CmMallProductSearchHistory;
|
|
|
import com.caimei.service.search.SearchService;
|
|
|
import com.caimei.utils.AppUtils;
|
|
|
-import com.caimei.vo.WxJsonModel;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
@@ -37,7 +36,7 @@ public class SearchController {
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
@RequestMapping("/product")
|
|
|
- public WxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
|
|
|
+ public CmWxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
|
|
|
Integer pageSize, HttpServletRequest request) {
|
|
|
CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
|
String openID = (String) jsonModel.getData();
|
|
@@ -57,7 +56,7 @@ public class SearchController {
|
|
|
}
|
|
|
}
|
|
|
CmMallPage<CmMallOrganizeProducts> productsPage = new CmMallPage<>(list);
|
|
|
- return WxJsonModel.newInstance().success(productsPage);
|
|
|
+ return CmWxJsonModel.newInstance().success(productsPage);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -65,10 +64,10 @@ public class SearchController {
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
@RequestMapping("/record")
|
|
|
- public WxJsonModel productRecord(Integer organizeID, String code, HttpServletRequest request) {
|
|
|
+ public CmWxJsonModel productRecord(Integer organizeID, String code, HttpServletRequest request) {
|
|
|
CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
|
String openID = (String) jsonModel.getData();
|
|
|
List<CmMallProductSearchHistory> historyList = searchService.findProductRecord(organizeID, openID);
|
|
|
- return WxJsonModel.newInstance().success(historyList);
|
|
|
+ return CmWxJsonModel.newInstance().success(historyList);
|
|
|
}
|
|
|
}
|