Merge branch 'dev-new-houpn' into dev

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/controller/OrderController.java

@@ -264,4 +264,18 @@ public class OrderController {
         //redisTemplate.delete(WORKER + worker.getWorkerId());
         return ResultUtil.success("更新操作成功");
     }
+
+    @RequestMapping(value = "/app/getAllStatus/{id}/{status}", method = RequestMethod.GET)
+    @ApiOperation(value = "获取各个状态的订单列表-App")
+    public Result<List<OrderXd>> getAllStatusList(@PathVariable String id,@PathVariable String status) {
+        /**
+         * 根据抢单工编号以及传递的订单的值进行查询各状态下的订单
+         * */
+        OrderXd orderxd = new OrderXd();
+        orderxd.setOrderByWorker(id);
+        orderxd.setOrderStatus(Integer.valueOf(status));
+        List<OrderXd> list = orderService.findByCondition(orderxd);
+        return new ResultUtil<List<OrderXd>>().setData(list,"查询成功");
+    }
+
 }