|
|
@@ -219,14 +219,10 @@
|
|
|
AND tppi.period_flag = 2
|
|
|
LIMIT 1
|
|
|
) AS peak_time,
|
|
|
- <!-- 平台价(电费+服务费+运营费+综合销售费) -->
|
|
|
+ <!-- 平台价(综合销售费) -->
|
|
|
(
|
|
|
SELECT
|
|
|
- ROUND(
|
|
|
- IFNULL(tppi.elec_price, 0) + IFNULL(tppi.service_price, 0)
|
|
|
- + IFNULL(pf.op_fee, 0) + IFNULL(pf.comp_sales_fee, 0),
|
|
|
- 4
|
|
|
- )
|
|
|
+ ROUND(IFNULL(pf.comp_sales_fee, 0), 4)
|
|
|
FROM c_policy_fee pf
|
|
|
INNER JOIN third_party_policy_info tppi ON pf.period_flag = tppi.period_flag
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|
|
|
@@ -244,11 +240,7 @@
|
|
|
<if test="firmId != null">
|
|
|
(
|
|
|
SELECT
|
|
|
- ROUND(
|
|
|
- IFNULL(tppi.elec_price, 0) + IFNULL(tppi.service_price, 0)
|
|
|
- + IFNULL(pf.op_fee, 0) + IFNULL(pf.comp_sales_fee, 0),
|
|
|
- 4
|
|
|
- )
|
|
|
+ ROUND(IFNULL(pf.comp_sales_fee, 0), 4)
|
|
|
FROM c_policy_fee pf
|
|
|
INNER JOIN third_party_policy_info tppi ON pf.period_flag = tppi.period_flag
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|
|
|
@@ -381,14 +373,10 @@
|
|
|
AND tppi.period_flag = 2
|
|
|
LIMIT 1
|
|
|
) AS peak_time,
|
|
|
- <!-- 平台价(电费+服务费+运营费+综合销售费) -->
|
|
|
+ <!-- 平台价(综合销售费) -->
|
|
|
(
|
|
|
SELECT
|
|
|
- ROUND(
|
|
|
- IFNULL(tppi.elec_price, 0) + IFNULL(tppi.service_price, 0)
|
|
|
- + IFNULL(pf.op_fee, 0) + IFNULL(pf.comp_sales_fee, 0),
|
|
|
- 4
|
|
|
- )
|
|
|
+ ROUND(IFNULL(pf.comp_sales_fee, 0), 4)
|
|
|
FROM c_policy_fee pf
|
|
|
INNER JOIN third_party_policy_info tppi ON pf.period_flag = tppi.period_flag
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|
|
|
@@ -462,14 +450,10 @@
|
|
|
<if test="longitude == null or latitude == null">
|
|
|
NULL AS distance,
|
|
|
</if>
|
|
|
- <!-- 当前价(电费+服务费+运营费+综合销售费) -->
|
|
|
+ <!-- 当前价(综合销售费) -->
|
|
|
(
|
|
|
SELECT
|
|
|
- ROUND(
|
|
|
- IFNULL(tppi.elec_price, 0) + IFNULL(tppi.service_price, 0)
|
|
|
- + IFNULL(pf.op_fee, 0) + IFNULL(pf.comp_sales_fee, 0),
|
|
|
- 4
|
|
|
- )
|
|
|
+ ROUND(IFNULL(pf.comp_sales_fee, 0), 4)
|
|
|
FROM c_policy_fee pf
|
|
|
INNER JOIN third_party_policy_info tppi ON pf.period_flag = tppi.period_flag
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|
|
|
@@ -535,11 +519,7 @@
|
|
|
<if test="firmId != null">
|
|
|
(
|
|
|
SELECT
|
|
|
- ROUND(
|
|
|
- IFNULL(tppi.elec_price, 0) + IFNULL(tppi.service_price, 0)
|
|
|
- + IFNULL(pf.op_fee, 0) + IFNULL(pf.comp_sales_fee, 0),
|
|
|
- 4
|
|
|
- )
|
|
|
+ ROUND(IFNULL(pf.comp_sales_fee, 0), 4)
|
|
|
FROM c_policy_fee pf
|
|
|
INNER JOIN third_party_policy_info tppi ON pf.period_flag = tppi.period_flag
|
|
|
INNER JOIN third_party_equipment_price_policy tpepp ON tppi.price_policy_id = tpepp.id AND tpepp.is_deleted = 0
|