订单查询添加type参数

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderController.java

@@ -1017,7 +1017,7 @@ public class PosOrderController extends BaseController {
     @Anonymous
     @Auth
     @GetMapping("/getstoreorderlist")
-    public AjaxResult getstoreorderlist(@RequestHeader String token, @RequestParam Integer page, @RequestParam Integer size, @RequestParam String mdId, @RequestParam(defaultValue = "") String state, @RequestParam(defaultValue = "") String diningStatus) {
+    public AjaxResult getstoreorderlist(@RequestHeader String token, @RequestParam Integer page, @RequestParam Integer size, @RequestParam String mdId, @RequestParam(defaultValue = "") String state, @RequestParam(defaultValue = "") String diningStatus,@RequestParam(defaultValue = "")String type) {
         JwtUtil jwtUtil = new JwtUtil();
         String id = jwtUtil.getusid(token);
         IPage<PosOrder> palist = new Page<>(page, size);
@@ -1026,6 +1026,7 @@ public class PosOrderController extends BaseController {
         queryWrapper.eq("sh_id", id);
         System.out.println("商户id:" + id);
         queryWrapper.eq("md_id", mdId).eq("is_display", true);
+        queryWrapper.eq(!StringUtils.isEmpty(type),"type",type);
         if (!"".equals(state)) {
             if (state.equals("z01")) {
                 queryWrapper.apply(" ((state = 0 AND (collect_payment = 1 OR type = 1)) OR (state = 1))");
@@ -1094,17 +1095,18 @@ public class PosOrderController extends BaseController {
         return success(arr);
     }
 
-    //查询用户的订单
+    //查询用户的订单(用户端)
     @Anonymous
     @Auth
     @GetMapping("/getorderlist")
-    public AjaxResult getorderlist(@RequestHeader String token, @RequestParam Integer page, @RequestParam Integer size, @RequestParam(defaultValue = "") String state) {
+    public AjaxResult getorderlist(@RequestHeader String token, @RequestParam Integer page, @RequestParam Integer size, @RequestParam(defaultValue = "") String state,@RequestParam(defaultValue = "")String type) {
         JwtUtil jwtUtil = new JwtUtil();
         String id = jwtUtil.getusid(token);
         IPage<PosOrder> palist = new Page<>(page, size);
         QueryWrapper<PosOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.select().orderByDesc("cretim");
         queryWrapper.eq("user_id", id);
+        queryWrapper.eq(!StringUtils.isEmpty(type),"type",type);
         if (!"".equals(state)) {
             if (state.equals("z23412")) {
                 queryWrapper.in("state", 2, 3, 4, 12);