|
@@ -4609,7 +4609,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";
|
|
}
|
|
}
|
|
@@ -4636,7 +4636,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";
|
|
}
|
|
}
|
|
@@ -4716,7 +4716,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";
|
|
}
|
|
}
|
|
@@ -4745,7 +4745,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";
|
|
}
|
|
}
|
|
@@ -4775,7 +4775,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";
|
|
}
|
|
}
|
|
@@ -4876,7 +4876,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";
|
|
}
|
|
}
|
|
@@ -4927,7 +4927,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";
|
|
}
|
|
}
|
|
@@ -4969,7 +4969,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";
|
|
}
|
|
}
|
|
@@ -5028,7 +5028,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";
|
|
}
|
|
}
|