From f9816128849fc23175b65c440637702eaebe8a97 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 28 Nov 2024 10:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/OrderController.java | 16 ++++++++++++++++ .../material/order/domain/OrderDetailDto.java | 6 +++++- .../bonus/material/order/mapper/OrderMapper.java | 3 +++ .../order/service/impl/OrderServiceImpl.java | 1 - .../mapper/material/order/OrderInfoMapper.xml | 16 ++++++++++++---- 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index 4811336..426d920 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -68,4 +68,20 @@ public class OrderController extends BaseController { return error("参数错误"); } } + + /** + * 订单状态流转修改 + */ + @ApiOperation(value = "订单状态流转修改") + @PostMapping("/updateOrderStatus") + public AjaxResult updateOrderStatus(@RequestBody OrderDetailDto orderInfoDto) { + Integer i = orderMapper.updateOrderStatus(orderInfoDto.getIds(), orderInfoDto.getOrderStatus()); + if (i > 0) { + return success(); + } else { + return error(); + } + } + + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java index cb0f24e..f8d75ff 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java @@ -6,6 +6,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * @Author：liang.chao @@ -17,6 +18,9 @@ public class OrderDetailDto { @ApiModelProperty(value = "主键id") private Integer id; + @ApiModelProperty(value = "主键ids") + private List ids; + @ApiModelProperty(value = "订单id") private Integer orderId; @@ -52,7 +56,7 @@ public class OrderDetailDto { @ApiModelProperty(value = "日租金") private BigDecimal dayLeasePrice; - @ApiModelProperty(value = "订单状态") + @ApiModelProperty(value = "订单状态（0未下单 1已下单 2待出库 3待收货 4租赁中 5已退租 6已完成）") private String orderStatus; @ApiModelProperty(value = "创建日期") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java index 827825c..7be5d00 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java @@ -3,6 +3,7 @@ package com.bonus.material.order.mapper; import com.bonus.material.device.domain.DevInfo; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -25,4 +26,6 @@ public interface OrderMapper { OrderDetailDto selectOrderDetailsById(String id); void updateMaStatus(OrderDetailDto orderDetailDto); + + Integer updateOrderStatus(@Param("ids") List ids, @Param("orderStatus") String orderStatus); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 262a809..d47789f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -46,7 +46,6 @@ public class OrderServiceImpl implements OrderService { } //生成订单信息 String code = "D" + System.currentTimeMillis(); - orderInfoDto.setOrderStatus("2"); orderInfoDto.setCode(code); Long userid = SecurityUtils.getLoginUser().getUserid(); orderInfoDto.setOrderUser(userid); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml index 3c01d64..35772e4 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml @@ -5,9 +5,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into ma_order_info (code, order_time, cost, order_status, order_user, address, creater, create_time) + insert into ma_order_info (code, order_time, cost, order_user, address, creater, create_time) values - (#{code}, now(), #{cost}, #{orderStatus}, #{orderUser}, #{address}, #{creater}, now()) + (#{code}, now(), #{cost}, #{orderUser}, #{address}, #{creater}, now()) INSERT INTO `ma_order_details` ( @@ -18,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" `days`, `num`, `costs`, + `order_status`, `create_time`, `update_time` ) VALUES ( @@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{days}, #{num}, #{costs}, + 2, now(), #{updateTime}) @@ -37,6 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update book_car_detail set order_status = 1 where id = #{id} + + update ma_order_details set order_status = #{orderStatus} where id in + + #{id} + + @@ -72,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mdi.device_name like concat('%',#{deviceName},'%') - AND moi.order_status = #{orderStatus} + AND hh.order_status = #{orderStatus} AND moi.order_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') @@ -97,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT mdi.device_name, mdi.day_lease_price, - moi.order_status, + hh.order_status, hh.days, bfi.url, hh.id,