bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ah-simple' into ah-simple

This commit is contained in:
hongchao 2025-03-11 18:21:38 +08:00
parent c821ec5051 f2e39fd91a
commit 2bd60efa21
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java
View File

@ -156,4 +156,18 @@ public class OrderInfoDto {
private String keyWord; private String keyWord;
private String deviceNames; 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;
} }

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -265,6 +265,10 @@ public class OrderServiceImpl implements OrderService {
orderInfoDto.setPhoneNumber(Sm4Utils.decrypt(orderInfoDto.getPhoneNumber())); orderInfoDto.setPhoneNumber(Sm4Utils.decrypt(orderInfoDto.getPhoneNumber()));
orderInfoDto.setStartTime(list.get(0).getRentBeginTime()); orderInfoDto.setStartTime(list.get(0).getRentBeginTime());
orderInfoDto.setEndTime(list.get(0).getRentEndTime()); 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) { for (OrderDetailDto orderDetailDto : list) {
orderDetailDto.setTotalCost(orderDetailDto.getCosts()); orderDetailDto.setTotalCost(orderDetailDto.getCosts());
// 出库时间设置为租赁开始时间 // 出库时间设置为租赁开始时间

1
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
View File

@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaCode != null "> and bca.area_code = #{areaCode}</if> <if test="areaCode != null "> and bca.area_code = #{areaCode}</if>
<if test="address != null and address != ''"> and bca.address = #{address}</if> <if test="address != null and address != ''"> and bca.address = #{address}</if>
</where> </where>
ORDER BY bca.create_time DESC
</select> </select>
<select id="selectBmCompanyAddressById" parameterType="Long" resultMap="BmCompanyAddressResult"> <select id="selectBmCompanyAddressById" parameterType="Long" resultMap="BmCompanyAddressResult">