|
|
@@ -187,8 +187,8 @@
|
|
|
END
|
|
|
FROM third_party_policy_info tppi
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|
|
|
- INNER JOIN third_party_equipment_info tpei2 ON tpepp.equipment_id = tpei2.equipment_id AND tpei2.is_deleted = 0
|
|
|
- WHERE tpei2.station_id = tpsi.station_id
|
|
|
+ INNER JOIN third_party_connector_info tpci2 ON tpepp.connector_id = tpci2.connector_id AND tpci2.is_deleted = 0
|
|
|
+ WHERE tpci2.station_id = tpsi.station_id
|
|
|
AND tppi.is_deleted = 0
|
|
|
AND tppi.start_time <= #{currentTime}
|
|
|
ORDER BY tppi.start_time DESC
|
|
|
@@ -205,8 +205,8 @@
|
|
|
FROM c_policy_fee pf
|
|
|
INNER JOIN third_party_policy_info tppi ON pf.start_time = tppi.start_time
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|
|
|
- INNER JOIN third_party_equipment_info tpei3 ON tpepp.equipment_id = tpei3.equipment_id AND tpei3.is_deleted = 0
|
|
|
- WHERE tpei3.station_id = tpsi.station_id
|
|
|
+ INNER JOIN third_party_connector_info tpci3 ON tpepp.connector_id = tpci3.connector_id AND tpci3.is_deleted = 0
|
|
|
+ WHERE tpci3.station_id = tpsi.station_id
|
|
|
AND pf.station_info_id = tpsi.id
|
|
|
AND pf.sales_type = 0
|
|
|
AND pf.is_deleted = 0
|
|
|
@@ -227,8 +227,8 @@
|
|
|
FROM c_policy_fee pf
|
|
|
INNER JOIN third_party_policy_info tppi ON pf.start_time = tppi.start_time
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|
|
|
- INNER JOIN third_party_equipment_info tpei4 ON tpepp.equipment_id = tpei4.equipment_id AND tpei4.is_deleted = 0
|
|
|
- WHERE tpei4.station_id = tpsi.station_id
|
|
|
+ INNER JOIN third_party_connector_info tpci4 ON tpepp.connector_id = tpci4.connector_id AND tpci4.is_deleted = 0
|
|
|
+ WHERE tpci4.station_id = tpsi.station_id
|
|
|
AND pf.station_info_id = tpsi.id
|
|
|
AND pf.sales_type = 1
|
|
|
AND pf.firm_id = #{firmId}
|