diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRepairRecord.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRepairRecord.java index 668eceb..7f62b4b 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRepairRecord.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/domain/LeaseRepairRecord.java @@ -27,6 +27,9 @@ public class LeaseRepairRecord extends BaseEntity implements Serializable { private Integer id; + @ApiModelProperty(value = "前端是否选中(此字段仅供前端使用,默认0)") + private Integer isCheck = 0; + @ApiModelProperty(value = "订单id") private String orderId; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java index a5ab372..be5b9f1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/LeaseRepairRecordServiceImpl.java @@ -66,6 +66,7 @@ public class LeaseRepairRecordServiceImpl implements LeaseRepairRecordService { if (leaseRepairVo.getOrderId() != null) { LeaseRecordDto leaseRecordDto = getById(leaseRepairVo); leaseRepairVo.setTotalCost(leaseRecordDto.getTotalCost()); + leaseRepairVo.setIsChangePrice(leaseRecordDto.getIsChangePrice()); } } 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 9298f0f..be172c4 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 @@ -244,7 +244,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" hh.take_over_user, hh.take_over_time, hh.rent_over_user, - hh.rent_over_time + hh.rent_over_time, + hh.change_cost as changeCost FROM ma_order_details hh LEFT JOIN ma_order_info moi ON hh.order_id = moi.order_id