From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
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 9ad1c53..c703917 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
@@ -159,8 +159,16 @@
} catch (Exception e) {
bigDecimal = BigDecimal.ZERO;
}
- return R.ok(orderService.lambdaUpdate()
- .eq(Order::getId, orderId).set(Order::getSubsidy, bigDecimal).update());
+ Order order = orderService.lambdaQuery()
+ .eq(Order::getId, orderId).eq(Order::getIsDelete, 0).one();
+ BigDecimal subsidy = order.getSubsidy();
+ if (null == subsidy) {
+ order.setSubsidy(bigDecimal);
+ } else {
+ BigDecimal add = order.getSubsidy().add(bigDecimal);
+ order.setSubsidy(add);
+ }
+ return R.ok(orderService.updateById(order));
}
/**
@@ -319,8 +327,21 @@
@ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)
})
public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest request) {
- return R.ok(orderService.orderCount(request.getWorkerName(), request.getWorkerPhone(),
+ return R.ok(orderService.orderCount(request.getWorkerName(), request.getWorkerPhone(), request.getCityList(),
Page.of(request.getPageNum(), request.getPageSize())));
+ }
+
+ /**
+ * 判断用户是否下单
+ *
+ * @param userId 用户id
+ */
+ @GetMapping(value = "/orderByUserId")
+ public R<Boolean> orderByUserId(@RequestParam("userId") Integer userId) {
+ List<Order> list = orderService.lambdaQuery()
+ .eq(Order::getUserId, userId)
+ .eq(Order::getIsDelete, Constants.ZERO).list();
+ return R.ok(!list.isEmpty());
}
/**
@@ -451,6 +472,7 @@
public R<OrderDetailVO> orderDetail(@RequestParam("orderId") String orderId) {
// 订单信息
Order order = orderService.lambdaQuery().eq(Order::getId, orderId).eq(Order::getIsDelete, 0).one();
+ order.setReservationAddress(order.getReservationAddress() + order.getAddress());
// 服务信息(服务备注、上门时间、完成时间、完成所拍现场照片)
ServeRecord serveRecord = serveRecordService.lambdaQuery().eq(ServeRecord::getOrderId, orderId)
.eq(ServeRecord::getIsDelete, 0).one();
@@ -556,7 +578,9 @@
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryChainWrapper<Order> wrapper = orderService.lambdaQuery()
.eq(Order::getIsDelete, 0).eq(Order::getUserId, userId);
- if (state != -1) {
+ if (state == 1 || state == 2) {
+ wrapper.in(Order::getState, Constants.ONE, Constants.TWO);
+ } else if (state != -1) {
wrapper.eq(Order::getState, state);
}
return R.ok(wrapper.orderByDesc(Order::getCreateTime).page(Page.of(pageNum, pageSize)));
--
Gitblit v1.7.1