|
@@ -4617,7 +4617,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {5});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantMealOrderList";
|
|
return "sys/fx/merchantMealOrderList";
|
|
}
|
|
}
|
|
@@ -4644,7 +4644,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {5});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantMealList";
|
|
return "sys/fx/merchantMealList";
|
|
}
|
|
}
|
|
@@ -4724,7 +4724,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {5});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantSignOrderList";
|
|
return "sys/fx/merchantSignOrderList";
|
|
}
|
|
}
|
|
@@ -4753,7 +4753,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {5});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantPlatOrderList";
|
|
return "sys/fx/merchantPlatOrderList";
|
|
}
|
|
}
|
|
@@ -4783,7 +4783,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {5});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantSignList";
|
|
return "sys/fx/merchantSignList";
|
|
}
|
|
}
|
|
@@ -4884,7 +4884,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {5});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantCapList";
|
|
return "sys/fx/merchantCapList";
|
|
}
|
|
}
|
|
@@ -4935,7 +4935,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {1});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantCapOldList";
|
|
return "sys/fx/merchantCapOldList";
|
|
}
|
|
}
|
|
@@ -4977,7 +4977,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {1});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantBalanceOldList";
|
|
return "sys/fx/merchantBalanceOldList";
|
|
}
|
|
}
|
|
@@ -5036,7 +5036,7 @@ public class FxController extends BaseController {
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("listNavigatHtml", sp.getSysPaginHtml());
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("page", sp);
|
|
model.addAttribute("search", params);
|
|
model.addAttribute("search", params);
|
|
- List<Merchant> list=merchantService.findMerchantByPage();
|
|
|
|
|
|
+ List<Merchant> list=merchantService.findMerchantByType(new int[] {5});
|
|
model.addAttribute("poslist", list);
|
|
model.addAttribute("poslist", list);
|
|
return "sys/fx/merchantBalanceList";
|
|
return "sys/fx/merchantBalanceList";
|
|
}
|
|
}
|