From 365036ca508291a97db1ad8fc7d39afd96595702 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 5 Dec 2024 18:12:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=94=B9=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/lease/domain/LeaseRepairRecord.java | 3 +++ .../lease/service/impl/LeaseRepairRecordServiceImpl.java | 1 + .../main/resources/mapper/material/order/OrderInfoMapper.xml | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) 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