From 5f73bba6caafef94fcb97230d106621e780405b3 Mon Sep 17 00:00:00 2001 From: hans <2216464999@qq.com> Date: Sun, 31 Aug 2025 17:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/OrderController.java | 9 +++++++++ .../java/org/dromara/system/domain/Order.java | 4 ++++ .../org/dromara/system/domain/bo/OrderBo.java | 6 +++++- .../org/dromara/system/domain/vo/OrderVo.java | 8 ++++++++ .../dromara/system/service/IOrderService.java | 7 +++++++ .../system/service/impl/OrderServiceImpl.java | 20 +++++++++++++++++++ 6 files changed, 53 insertions(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/OrderController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/OrderController.java index 45c5c27ba..edc87296b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/OrderController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/OrderController.java @@ -118,6 +118,15 @@ public class OrderController extends BaseController { @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody OrderBo bo) { return toAjax(orderService.updateByBo(bo)); + } /** + * 修改订单明细 + */ + @SaCheckPermission("system:order:edit") + @Log(title = "订单明细", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping("/updateOrderStatus") + public R updateOrderStatus(@Validated(EditGroup.class) @RequestBody OrderBo bo) { + return toAjax(orderService.updateOrderStatus(bo)); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java index bec7ae57c..ac6781dc4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/Order.java @@ -121,6 +121,10 @@ public class Order extends TenantEntity { * 支付时间 */ private Date payTime; + /** + * 取消时间 + */ + private Date cancelTime; /** * 发货时间 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java index bd04ff85f..7ea6e272b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OrderBo.java @@ -1,5 +1,6 @@ package org.dromara.system.domain.bo; +import cn.idev.excel.annotation.ExcelProperty; import org.dromara.system.domain.Order; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; @@ -150,6 +151,9 @@ public class OrderBo extends BaseEntity { * 备注 */ private String remark; - + /** + * 取消时间 + */ + private Date cancelTime; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java index 00b2a8fcc..f291c055d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/OrderVo.java @@ -167,13 +167,21 @@ public class OrderVo implements Serializable { * 支付时间 */ @ExcelProperty(value = "支付时间") + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date payTime; /** * 发货时间 */ @ExcelProperty(value = "发货时间") + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") private Date shipmentTime; + /** + * 取消时间 + */ + @ExcelProperty(value = "取消时间") + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date cancelTime; /** * 发货图片 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IOrderService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IOrderService.java index 4bf18740d..020ea15ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IOrderService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IOrderService.java @@ -64,6 +64,13 @@ public interface IOrderService { * @return 是否修改成功 */ Boolean updateByBo(OrderBo bo); + /** + * 修改订单明细 + * + * @param bo 订单明细 + * @return 是否修改成功 + */ + Boolean updateOrderStatus(OrderBo bo); /** * 校验并批量删除订单明细信息 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java index bcd970e9f..eaf6fa32c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/OrderServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -169,6 +170,25 @@ public class OrderServiceImpl implements IOrderService { return baseMapper.updateById(update) > 0; } + @Override + public Boolean updateOrderStatus(OrderBo bo) { + UpdateWrapper orderUpdateWrapper = new UpdateWrapper(); + orderUpdateWrapper.eq("id", bo.getId()); + orderUpdateWrapper.set("order_status",bo.getOrderStatus()); + if(bo.getOrderStatus().equals("1")){ + orderUpdateWrapper.set("pay_time",DateUtils.getNowDate()); + } + if(bo.getOrderStatus().equals("0")){ + orderUpdateWrapper.set("pay_time",null); + } + if(bo.getOrderStatus().equals("6")){ + orderUpdateWrapper.set("cancel_time",DateUtils.getNowDate()); + }else{ + orderUpdateWrapper.set("cancel_time",null); + } + return baseMapper.update(orderUpdateWrapper) > 0; + } + /** * 保存前的数据校验 */