From 6e70ee2d0b73f70fe1140cc7d51c4e847d50aa51 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 17 四月 2025 10:54:26 +0800
Subject: [PATCH] 2.0迭代师傅订单列表
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java | 2
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 2
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java | 2
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java | 13 +++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 19 ++++++++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 4 +-
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WorkerOrderCountVO.java | 3 +
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java | 2
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 2
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml | 15 ++++++-
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java | 36 +++++++++---------
13 files changed, 69 insertions(+), 35 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
index 16a2b7e..138be89 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
@@ -114,7 +114,7 @@
@TableField("reservation_remark")
private String reservationRemark;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，7：待预约)")
@TableField("state")
private Integer state;
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
index 25827f7..ed4c78f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderQueryRequest.java
@@ -31,7 +31,7 @@
@ApiModelProperty("预约手机号")
private String reservationPhone;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派，7：待预约)")
private Integer state;
@ApiModelProperty("师傅名称")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WorkerOrderCountVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WorkerOrderCountVO.java
index 51ae447..58c56a7 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WorkerOrderCountVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/WorkerOrderCountVO.java
@@ -20,5 +20,8 @@
@ApiModelProperty("已完结订单数")
private Integer completed;
+ @ApiModelProperty("待预约订单数")
+ private Integer pending;
+
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
index 69f5465..16d9c17 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/factory/OrderFallbackFactory.java
@@ -162,7 +162,7 @@
}
@Override
- public R<Page<Order>> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize) {
+ public R<Page<Order>> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
return R.fail(cause.getMessage());
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 3fe9889..0241f39 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -244,7 +244,7 @@
* @return 交易额
*/
@GetMapping(value = "/order/orderListWorker")
- R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,
+ R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize);
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index f598920..55fc35b 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -653,10 +653,10 @@
*/
@ApiOperation(value = "师傅端-订单列表", tags = {"师傅端"})
@GetMapping(value = "/orderListWorker")
- public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,
+ public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return R.ok(orderService.orderListWorker(userId, state, pageNum, pageSize));
+ return R.ok(orderService.orderListWorker(userId, state, searchValues,pageNum, pageSize));
}
/**
@@ -885,4 +885,19 @@
return R.ok(orderService.placeOrder(userOrderRequest));
}
+ /**
+ * 师傅端-打电话
+ */
+ @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
+ @GetMapping(value = "/call")
+ public R<String> call(@RequestParam Integer orderId) {
+ Order order = orderService.getById(orderId);
+ if(Objects.isNull(order)){
+ return R.fail("订单不存在");
+ }
+ order.setState(2);
+ orderService.updateById(order);
+ return R.ok();
+ }
+
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
index 224b8a0..4be2b7c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -117,7 +117,7 @@
@TableField("reservation_remark")
private String reservationRemark;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派，7：待预约)")
@TableField("state")
private Integer state;
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
index 108169e..90e9d92 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java
@@ -138,7 +138,7 @@
* @param page 分页
* @return 交易额
*/
- Page<Order> orderListWorker(@Param("userId") Integer userId, @Param("state") Integer state, Page<Order> page);
+ Page<Order> orderListWorker(@Param("userId") Integer userId, @Param("state") Integer state,@Param("searchValues")String searchValues, Page<Order> page);
/**
* 师傅端-根据师傅id获取订单数量
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 4158188..7bd0d19 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -82,7 +82,7 @@
* @param pageSize 条数
* @return 交易额
*/
- Page<Order> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize);
+ Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize);
/**
* 师傅端-根据师傅id获取订单数量
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 7e1eb65..8d445e0 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -220,8 +220,8 @@
}
@Override
- public Page<Order> orderListWorker(Integer userId, Integer state, Integer pageNum, Integer pageSize) {
- return baseMapper.orderListWorker(userId, state, Page.of(pageNum, pageSize));
+ public Page<Order> orderListWorker(Integer userId, Integer state,String searchValues, Integer pageNum, Integer pageSize) {
+ return baseMapper.orderListWorker(userId, state,searchValues, Page.of(pageNum, pageSize));
}
@Override
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
index 01d048c..119546a 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -641,6 +641,11 @@
<where>
o.is_delete = 0
and o.server_id = #{userId}
+ <if test="searchValues != null and searchValues != ''">
+ and (o.reservation_name like concat('%', #{searchValues}, '%')
+ or o.reservation_phone like concat('%', #{searchValues}, '%')
+ or o.reservation_address like concat('%', #{searchValues}, '%'))
+ </if>
<choose>
<when test="state == 1">
and o.state in (1, 2)
@@ -648,8 +653,11 @@
<when test="state == 2">
and o.state = 3
</when>
+ <when test="state == 7">
+ and o.state = 7
+ </when>
<otherwise>
- and o.state in (1, 2, 3)
+ and o.state in (1, 2, 3,7)
</otherwise>
</choose>
</where>
@@ -673,9 +681,10 @@
</select>
<select id="orderStateCount" resultType="com.ruoyi.order.vo.WorkerOrderCountVO">
- SELECT COALESCE(SUM(CASE WHEN o.state IN (1, 2, 3) THEN 1 ELSE 0 END), 0) AS total,
+ SELECT COALESCE(SUM(CASE WHEN o.state IN (1, 2, 3,7) THEN 1 ELSE 0 END), 0) AS total,
COALESCE(SUM(CASE WHEN o.state in (1, 2) THEN 1 ELSE 0 END), 0) AS waitVisit,
- COALESCE(SUM(CASE WHEN o.state = 3 THEN 1 ELSE 0 END), 0) AS completed
+ COALESCE(SUM(CASE WHEN o.state = 3 THEN 1 ELSE 0 END), 0) AS completed,
+ COALESCE(SUM(CASE WHEN o.state = 7 THEN 1 ELSE 0 END), 0) AS pending
FROM t_order o
where o.server_id = #{workerId}
and o.is_delete = 0
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
index fce7784..80b56fc 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/MasterWorkerController.java
@@ -579,23 +579,23 @@
/**
* 师傅端-修改性别
*/
- @ApiOperation(value = "修改师傅实时位置", tags = {"师傅端-个人中心[2.0]"})
- @GetMapping(value = "/updateLonLat")
- @ApiImplicitParams({
- @ApiImplicitParam(value = "经度", name = "workerLon", dataType = "String", required = true),
- @ApiImplicitParam(value = "纬度", name = "workerLat", dataType = "String", required = true),
- })
- public R<String> updateLonLat(@RequestParam("workerLon") String workerLon, @RequestParam("workerLat") String workerLat) {
- LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
- if (null == loginWorker) {
- return R.loginExpire("登录已失效！");
- }
- boolean update = masterWorkerService.lambdaUpdate()
- .set(MasterWorker::getWorkerLon, workerLon)
- .set(MasterWorker::getWorkerLat, workerLat)
- .eq(MasterWorker::getId, loginWorker.getUserid())
- .eq(MasterWorker::getIsDelete, 0).update();
- return update ? R.ok("修改成功！") : R.fail("修改失败！");
- }
+// @ApiOperation(value = "修改师傅实时位置", tags = {"师傅端-个人中心[2.0]"})
+// @GetMapping(value = "/updateLonLat")
+// @ApiImplicitParams({
+// @ApiImplicitParam(value = "经度", name = "workerLon", dataType = "String", required = true),
+// @ApiImplicitParam(value = "纬度", name = "workerLat", dataType = "String", required = true),
+// })
+// public R<String> updateLonLat(@RequestParam("workerLon") String workerLon, @RequestParam("workerLat") String workerLat) {
+// LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
+// if (null == loginWorker) {
+// return R.loginExpire("登录已失效！");
+// }
+// boolean update = masterWorkerService.lambdaUpdate()
+// .set(MasterWorker::getWorkerLon, workerLon)
+// .set(MasterWorker::getWorkerLat, workerLat)
+// .eq(MasterWorker::getId, loginWorker.getUserid())
+// .eq(MasterWorker::getIsDelete, 0).update();
+// return update ? R.ok("修改成功！") : R.fail("修改失败！");
+// }
}
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
index 3583d1e..cf1d75f 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/controller/OrderController.java
@@ -95,19 +95,21 @@
*
* @param state 订单状态(0:全部、1:待上门、2:已完结)
*/
- @ApiOperation(value = "订单列表", tags = {"师傅端-订单列表"})
+ @ApiOperation(value = "订单列表", tags = {"师傅端-订单列表[2.0]"})
@GetMapping(value = "/orderList")
@ApiImplicitParams({
- @ApiImplicitParam(value = "订单状态(0:全部、1:待上门、2:已完结)", name = "state", dataType = "Integer", required = true)
+ @ApiImplicitParam(value = "订单状态(0:全部、1:待上门、2:已完结、7：待预约)", name = "state", dataType = "Integer", required = true),
+ @ApiImplicitParam(value = "姓名，电话，地址搜索", name = "searchValues", dataType = "String", required = false),
})
public R<Page<Order>> orderList(@RequestParam Integer state,
+ @RequestParam String searchValues,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LoginUserInfo loginWorker = tokenService.getLoginUserByWorker();
if (null == loginWorker) {
return R.loginExpire("登录失效！");
}
- Page<Order> dataList = orderClient.orderListWorker(loginWorker.getUserid(), state, pageNum, pageSize).getData();
+ Page<Order> dataList = orderClient.orderListWorker(loginWorker.getUserid(), state,searchValues, pageNum, pageSize).getData();
List<Order> orderList = dataList.getRecords();
List<Integer> ids = orderList.stream().map(Order::getServeId).collect(Collectors.toList());
if (!ids.isEmpty()) {
@@ -554,6 +556,11 @@
redisService.setCacheSet("workerLocation:"+cityCode+":", strings);
redisService.setCacheSet("workerLocation:"+provinceCode+":", strings);
redisService.setCacheObject("work:"+workId+":", longitude+","+latitude);
+ masterWorkerService.lambdaUpdate()
+ .set(MasterWorker::getWorkerLon, longitude)
+ .set(MasterWorker::getWorkerLat, latitude)
+ .eq(MasterWorker::getId, workId)
+ .eq(MasterWorker::getIsDelete, 0).update();
return R.ok();
}
--
Gitblit v1.7.1