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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
syruan 2023-12-08 17:33:39 +08:00
parent 49dd582e5a 5a94bafff3
commit 50198ee819
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ public class OrderInfoVo extends OrderInfo {
@ApiModelProperty(value = "装备位置")
private String deviceLocation;
@ApiModelProperty(value = "装备月租金")
private String deviceMonthLeasePrice;
private Double deviceMonthLeasePrice;
@ApiModelProperty(value = "装备id")
private Long maId;
@ApiModelProperty(value = "联系电话")

2
zlpt-modules/zlpt-equip/src/main/resources/mapper/DevInfoMapper.xml
View File

@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="maId != null "> and d.ma_id = #{maId}</if>
<if test="code != null and code != ''"> and d.code = #{code}</if>
<if test="typeId != null and level != null and level != '1'">
<if test="typeId != null and level != null and level != 1">
and d.type_id = #{typeId} or t.parent_id = #{typeId}
</if>
<if test="maStatus != null and maStatus != ''"> and d.ma_status = #{maStatus}</if>

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

@ -118,7 +118,12 @@ public class OrderInfoController extends BaseController
orderInfo.setDeviceBrand((String) map2.get("brand"));
orderInfo.setDeviceSpecification((String) map2.get("specification"));
orderInfo.setDeviceLocation((String) map2.get("location"));
orderInfo.setDeviceMonthLeasePrice((String) map2.get("monthLeasePrice"));
try {
Double price = (Double) map2.get("monthLeasePrice");
orderInfo.setDeviceMonthLeasePrice(price);
} catch (Exception e) {
e.printStackTrace();
}
}
}
return success(orderInfo);