From 43e80f96261563bd06487a90c5895887c6e82ca0 Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 24 Dec 2025 16:50:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=B8=85=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cst/order/controller/OrderController.java | 13 +++++++---- .../cst/order/pojo/param/StartTransParam.java | 22 +++++++++++++++++++ .../cst/order/service/OrderService.java | 18 +++++++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/StartTransParam.java diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java index 1d9c1ba..b22a01b 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/controller/OrderController.java @@ -4,10 +4,7 @@ import com.njzscloud.common.core.utils.R; import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.dispose.cst.order.pojo.entity.OrderEntity; -import com.njzscloud.dispose.cst.order.pojo.param.AssignmentDriverParam; -import com.njzscloud.dispose.cst.order.pojo.param.AssignmentOrgParam; -import com.njzscloud.dispose.cst.order.pojo.param.CreateOrderParam; -import com.njzscloud.dispose.cst.order.pojo.param.DriverAcceptOrderParam; +import com.njzscloud.dispose.cst.order.pojo.param.*; import com.njzscloud.dispose.cst.order.service.OrderService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -98,6 +95,14 @@ public class OrderController { return R.success(); } + /** + * 开始清运 + */ + @PostMapping("/start_trans") + public R startTrans(@RequestBody StartTransParam transParam) { + orderService.startTrans(transParam); + return R.success(); + } } diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/StartTransParam.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/StartTransParam.java new file mode 100644 index 0000000..2b2bad1 --- /dev/null +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/pojo/param/StartTransParam.java @@ -0,0 +1,22 @@ +package com.njzscloud.dispose.cst.order.pojo.param; + +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import lombok.experimental.Accessors; + +/** + * @author ljw + */ +@Getter +@Setter +@ToString +@Accessors(chain = true) +public class StartTransParam { + + /** + * 订单运输ID + */ + private Long orderTransId; + +} diff --git a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java index e5a633b..133c0f7 100644 --- a/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java +++ b/njzscloud-svr/src/main/java/com/njzscloud/dispose/cst/order/service/OrderService.java @@ -224,6 +224,24 @@ public class OrderService extends ServiceImpl { } + @Transactional(rollbackFor = Exception.class) + public void startTrans(StartTransParam transParam) { + Assert.notNull(transParam, () -> Exceptions.clierr("请填写参数")); + Assert.notNull(transParam.getOrderTransId(), () -> Exceptions.clierr("订单运输ID不可为空")); + + OrderTransResult result = orderTransMapper.getById(transParam.getOrderTransId()); + Assert.notNull(result, () -> Exceptions.clierr("订单不存在")); + Assert.isTrue(TransStatus.YiJieDan.getVal().equals(result.getTransStatus()), () -> Exceptions.clierr("当前订单状态,无法开始运输")); + + // 更新运输信息 + OrderTransEntity transEntity = new OrderTransEntity(); + transEntity.setId(transParam.getOrderTransId()); + transEntity.setTransStatus(TransStatus.YunShuZhong.getVal()); + transEntity.setTransTime(LocalDateTime.now()); + orderTransMapper.updateById(transEntity); + + } + /** * 生成订单号 *