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

fix

This commit is contained in:
sxu 2023-12-08 15:19:39 +08:00
parent 08dc0a7d96
commit 0d2927a2ca
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java
View File

@ -19,6 +19,18 @@ public class OrderInfoVo extends OrderInfo {
/* 装备名称 child */ /* 装备名称 child */
@ApiModelProperty(value = "装备名称") @ApiModelProperty(value = "装备名称")
private String deviceName; private String deviceName;
@ApiModelProperty(value = "装备编码")
private String deviceCode;
@ApiModelProperty(value = "装备图片")
private String devicePicUrl;
@ApiModelProperty(value = "装备品牌")
private String deviceBrand;
@ApiModelProperty(value = "装备规格")
private String deviceSpecification;
@ApiModelProperty(value = "装备位置")
private String deviceLocation;
@ApiModelProperty(value = "装备月租金")
private String deviceMonthLeasePrice;
@ApiModelProperty(value = "装备id") @ApiModelProperty(value = "装备id")
private Long maId; private Long maId;
@ApiModelProperty(value = "联系电话") @ApiModelProperty(value = "联系电话")
@ -53,7 +65,7 @@ public class OrderInfoVo extends OrderInfo {
private String orderContract; private String orderContract;
@ApiModelProperty(value = "机手姓名") @ApiModelProperty(value = "机手姓名")
private String machinistName; private String machinistName;
@ApiModelProperty(value = "联系电话") @ApiModelProperty(value = "机手联系电话")
private String phone; private String phone;
@ApiModelProperty(value = "物流司机电话") @ApiModelProperty(value = "物流司机电话")
private String logisticsPhone; private String logisticsPhone;
@ -68,4 +80,6 @@ public class OrderInfoVo extends OrderInfo {
/* 合同附件 */ /* 合同附件 */
@ApiModelProperty(value = "合同附件") @ApiModelProperty(value = "合同附件")
private String contractUrl; private String contractUrl;
@ApiModelProperty(value = "订单状态文字")
private String orderStatusStr;
} }

7
zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java
View File

@ -112,6 +112,13 @@ public class OrderInfoController extends BaseController
orderInfo.setTypeName(typeName); orderInfo.setTypeName(typeName);
orderInfo.setGroupName(groupName); orderInfo.setGroupName(groupName);
orderInfo.setDeviceName(modelName + deviceName); orderInfo.setDeviceName(modelName + deviceName);
//装备编号，图片，品牌，规格，位置addressId，月租金
orderInfo.setDeviceCode((String) map2.get("code"));
orderInfo.setDevicePicUrl((String) map2.get("picUrl"));
orderInfo.setDeviceBrand((String) map2.get("brand"));
orderInfo.setDeviceSpecification((String) map2.get("specification"));
orderInfo.setDeviceLocation((String) map2.get("location"));
orderInfo.setDeviceMonthLeasePrice((String) map2.get("monthLeasePrice"));
} }
} }
return success(orderInfo); return success(orderInfo);

2
zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml
View File

@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo"> <select id="selectOrderInfoByOrderId" parameterType="Long" resultType="com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo">
select d.*,o.code,o.time as order_time,o.order_status select d.*,o.code,o.time,o.order_status
from ma_order_info o from ma_order_info o
left join ma_order_details d on d.order_id = o.order_id left join ma_order_details d on d.order_id = o.order_id
where o.order_id = #{orderId} where o.order_id = #{orderId}