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 426d920..f29d9c9 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 @@ -3,6 +3,7 @@ package com.bonus.material.order.controller; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.book.domain.BookCarInfoDto; import com.bonus.material.order.domain.OrderDetailDto; import com.bonus.material.order.domain.OrderInfoDto; @@ -75,7 +76,8 @@ public class OrderController extends BaseController { @ApiOperation(value = "订单状态流转修改") @PostMapping("/updateOrderStatus") public AjaxResult updateOrderStatus(@RequestBody OrderDetailDto orderInfoDto) { - Integer i = orderMapper.updateOrderStatus(orderInfoDto.getIds(), orderInfoDto.getOrderStatus()); + Long userId = SecurityUtils.getLoginUser().getUserid(); + Integer i = orderMapper.updateOrderStatus(orderInfoDto.getIds(), orderInfoDto.getOrderStatus(),userId); if (i > 0) { return success(); } else { 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 7be5d00..5f52467 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 @@ -27,5 +27,5 @@ public interface OrderMapper { void updateMaStatus(OrderDetailDto orderDetailDto); - Integer updateOrderStatus(@Param("ids") List ids, @Param("orderStatus") String orderStatus); + Integer updateOrderStatus(@Param("ids") List ids, @Param("orderStatus") String orderStatus,@Param("userId") Long userId); } 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 d47789f..d369481 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 @@ -68,6 +68,9 @@ public class OrderServiceImpl implements OrderService { String ids = dto.getIds(); for (String id : ids.split(",")) { OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id); + if ("2".equals(orderDetailDto.getOrderStatus())){ + dto.setOrderStatus("2"); + } list.add(orderDetailDto); } dto.setDetailsList(list); 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 35772e4..9c98a23 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 @@ -40,7 +40,20 @@ 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 + update ma_order_details set order_status = #{orderStatus} + + ,pre_outbound_user = #{userId}, + ,pre_outbound_time = now() + + + ,take_over_user = #{userId}, + ,pre_outbound_time = now() + + + ,pre_outbound_user = #{phoneNumber}, + ,pre_outbound_time = now() + + where id in #{id}