|
@@ -248,14 +248,25 @@ public class AgentOrderHandler {
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 分页查询代理商采购订单
|
|
|
+ * @param request
|
|
|
+ * @param pageSize
|
|
|
+ * @param pageNO
|
|
|
+ * @return
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
@ResponseBody
|
|
|
@RequestMapping("/select_agent_order_list")
|
|
|
public ResultMsg selectAgentOrderList(HttpServletRequest request,
|
|
|
@RequestParam(value = "pageSize", defaultValue = "10", required = false) Integer pageSize,
|
|
|
+ @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
|
|
|
@RequestParam(value = "pageNO", defaultValue = "1") Integer pageNO) throws Exception {
|
|
|
ResultMsg msg = new ResultMsg();
|
|
|
Map<String, Object> map = new HashMap<String, Object>();
|
|
|
Member member = WechatUtils.getUserBySession(request);
|
|
|
+ Map<String,Object> map = new HashMap<String,Object>();
|
|
|
+ Member member = WechatUtils.getUserBySession(request);
|
|
|
AgentTooth agent = new AgentTooth();
|
|
|
agent.setAgentOpenid(member.getUserOpenid());
|
|
|
//获取代理商信息
|
|
@@ -274,6 +285,9 @@ public class AgentOrderHandler {
|
|
|
page.initRecordBegin();
|
|
|
agentOrder.setPage(page);
|
|
|
//获取订单集合
|
|
|
+ List<AgentOrder> agentOrderList = agentPurchaseOrderService.listAgentOrder(agentOrder);
|
|
|
+ map.put("agent",agent);
|
|
|
+ map.put("agentOrderList",agentOrderList);
|
|
|
List<AgentOrder> agentList = agentPurchaseOrderService.listAgentOrder(agentOrder);
|
|
|
map.put("agent", agent);
|
|
|
map.put("agentList", agentList);
|