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 9ddb471..7d95d45 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,9 +68,11 @@ 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"); } + // 待收货 if ("3".equals(orderDetailDto.getOrderStatus())){ dto.setOrderStatus("3"); } 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 11f5f17..d5117db 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 @@ -42,15 +42,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update ma_order_details set order_status = #{orderStatus} - ,pre_outbound_user = #{userName}, + ,pre_outbound_user = #{userName} ,pre_outbound_time = now() - ,take_over_user = #{userName}, + ,take_over_user = #{userName} ,take_over_time = now() - ,rent_over_user = #{userName}, + ,rent_over_user = #{userName} ,rent_over_time = now() where id in