diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index e8017af..1e9b647 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -156,4 +156,18 @@ public class OrderInfoDto { private String keyWord; private String deviceNames; + + @ApiModelProperty(value = "接单人") + private String receivingUser; + + @ApiModelProperty(value = "接单时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String receivingTime; + + @ApiModelProperty(value = "出库人") + private String preOutboundUser; + + @ApiModelProperty(value = "出库时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private String preOutboundTime; } 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 d533daf..462e011 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 @@ -265,6 +265,10 @@ public class OrderServiceImpl implements OrderService { orderInfoDto.setPhoneNumber(Sm4Utils.decrypt(orderInfoDto.getPhoneNumber())); orderInfoDto.setStartTime(list.get(0).getRentBeginTime()); orderInfoDto.setEndTime(list.get(0).getRentEndTime()); + orderInfoDto.setPreOutboundUser(list.get(0).getPreOutboundUser()); + orderInfoDto.setPreOutboundTime(list.get(0).getPreOutboundTime()); + orderInfoDto.setReceivingUser(list.get(0).getReceivingUser()); + orderInfoDto.setReceivingTime(list.get(0).getReceivingTime()); for (OrderDetailDto orderDetailDto : list) { orderDetailDto.setTotalCost(orderDetailDto.getCosts()); // 出库时间设置为租赁开始时间 diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml index 1f8e962..9d4fc06 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml @@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bca.area_code = #{areaCode} and bca.address = #{address} + ORDER BY bca.create_time DESC