|
@@ -37,6 +37,8 @@ public class SearchController {
|
|
@RequestMapping("/product")
|
|
@RequestMapping("/product")
|
|
public CmWxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
|
|
public CmWxJsonModel searchProduct(Integer organizeID, String searchWord, String code, Integer index,
|
|
Integer pageSize, HttpServletRequest request) {
|
|
Integer pageSize, HttpServletRequest request) {
|
|
|
|
+ CmWxJsonModel model = CmWxJsonModel.newInstance();
|
|
|
|
+ if (searchWord == null) return model.error("请输入商品关键词");
|
|
CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
String openID = (String) jsonModel.getData();
|
|
String openID = (String) jsonModel.getData();
|
|
//查询历史记录是否存在
|
|
//查询历史记录是否存在
|
|
@@ -61,7 +63,7 @@ public class SearchController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
CmMallPage<CmMallOrganizeProducts> productsPage = new CmMallPage<>(list);
|
|
CmMallPage<CmMallOrganizeProducts> productsPage = new CmMallPage<>(list);
|
|
- return CmWxJsonModel.newInstance().success(productsPage);
|
|
|
|
|
|
+ return model.success(productsPage);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -100,6 +102,8 @@ public class SearchController {
|
|
@RequestMapping("/order")
|
|
@RequestMapping("/order")
|
|
public CmWxJsonModel searchOrder(Integer organizeID, String searchWord, String code, Integer index,
|
|
public CmWxJsonModel searchOrder(Integer organizeID, String searchWord, String code, Integer index,
|
|
Integer pageSize, Integer userID, HttpServletRequest request) {
|
|
Integer pageSize, Integer userID, HttpServletRequest request) {
|
|
|
|
+ CmWxJsonModel model = CmWxJsonModel.newInstance();
|
|
|
|
+ if (searchWord == null) return model.error("请输入商品关键词");
|
|
CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
CmWxJsonModel jsonModel = loginController.login(code, request, organizeID);
|
|
String openID = (String) jsonModel.getData();
|
|
String openID = (String) jsonModel.getData();
|
|
//查询历史记录是否存在
|
|
//查询历史记录是否存在
|
|
@@ -138,7 +142,7 @@ public class SearchController {
|
|
order.setShopOrderList(shopOrderList);
|
|
order.setShopOrderList(shopOrderList);
|
|
}
|
|
}
|
|
CmMallPage<CmMallOrder> orderPage = new CmMallPage<>(orderList);
|
|
CmMallPage<CmMallOrder> orderPage = new CmMallPage<>(orderList);
|
|
- return CmWxJsonModel.newInstance().success(orderPage);
|
|
|
|
|
|
+ return model.success(orderPage);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|