From 2728ce36b1654e5aa9370ba8307e9574b1df4787 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 30 Aug 2023 15:49:37 +0800 Subject: [PATCH] update --- .../src/main/resources/mapper/pile/OrderPileOccupyMapper.xml | 2 ++ .../main/resources/mapper/pile/PileBillingTemplateMapper.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index 22a006ac0..4b00fdaa2 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -887,6 +887,7 @@ left join pile_station_info t2 on t1.station_id = t2.id where t1.member_id = #{memberId,jdbcType=VARCHAR} + and status != '9' order by t1.create_time desc @@ -899,6 +900,7 @@ del_flag = '0' and pay_status = '0' + and status = '2' and member_id = #{memberId,jdbcType=VARCHAR} order by create_time desc limit 1 diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml index 8947108d4..89fc4911d 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBillingTemplateMapper.xml @@ -316,6 +316,8 @@ t2.status, t2.remark as remark, t2.type as deviceType, + t2.free_time as freeTime, + t2.occupy_fee as occupyFee, t2.publish_time as publishTime, t3.electricity_price AS sharpElectricityPrice, t3.service_price AS sharpServicePrice,