|
@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AVG(mp.project_current_price) AS avgCurrentPrice,
|
|
AVG(mp.project_current_price) AS avgCurrentPrice,
|
|
|
pro.highlight AS highlight
|
|
pro.highlight AS highlight
|
|
|
FROM project pro
|
|
FROM project pro
|
|
|
- INNER JOIN ma_project mp ON CAST(mp.project_id AS UNSIGNED) = pro.id AND mp.merchant_type = '0' AND mp.is_delete = 0 AND mp.project_is_enable = 1
|
|
|
|
|
|
|
+ INNER JOIN ma_project mp ON CAST(mp.project_id AS UNSIGNED) = pro.id AND mp.merchant_type = 1 AND mp.is_delete = 0 AND mp.project_is_enable = 1
|
|
|
LEFT JOIN t_order o ON o.project_id = pro.id AND o.project_type = 1 AND o.status = 6 AND o.is_delete = 0
|
|
LEFT JOIN t_order o ON o.project_id = pro.id AND o.project_type = 1 AND o.status = 6 AND o.is_delete = 0
|
|
|
WHERE pro.is_delete = 0
|
|
WHERE pro.is_delete = 0
|
|
|
AND EXISTS (
|
|
AND EXISTS (
|
|
@@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
) stat ON stat.merchant_id = t.id
|
|
) stat ON stat.merchant_id = t.id
|
|
|
WHERE p.audit_status = 1
|
|
WHERE p.audit_status = 1
|
|
|
AND p.is_delete = 0
|
|
AND p.is_delete = 0
|
|
|
- AND p.merchant_type = 0
|
|
|
|
|
|
|
+ AND p.merchant_type = 1
|
|
|
AND p.project_is_enable = 0
|
|
AND p.project_is_enable = 0
|
|
|
AND t.audit_status = 2
|
|
AND t.audit_status = 2
|
|
|
AND t.is_delete = 0
|
|
AND t.is_delete = 0
|