Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Stat.php

@@ -45,7 +45,7 @@ FROM
 				wsm_sale_return e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
 				AND k.is_del = 0 
-				AND k.STATUS = 1 
+				AND k.STATUS = 1 and e.status=4
 			WHERE
 				k.itemid = c.id 
 				AND e.platform_id = a.platform_id 
@@ -56,7 +56,7 @@ FROM
 				wsm_order_back f
 				LEFT JOIN wsm_depart_user p ON f.apply_id = p.uid 
 				AND p.is_del = 0 
-				AND p.STATUS = 1 
+					AND p.STATUS = 1 and f.status=4
 			WHERE
 				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
@@ -92,7 +92,7 @@ FROM
 				wsm_sale_return e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
 				AND k.is_del = 0 
-				AND k.STATUS = 1 
+				AND k.STATUS = 1 and e.status=4
 			WHERE
 				k.itemid = c.id 
 				AND e.platform_id = a.platform_id 
@@ -104,7 +104,7 @@ FROM
 				wsm_order_back f
 				LEFT JOIN wsm_depart_user p ON f.apply_id = p.uid 
 				AND p.is_del = 0 
-				AND p.STATUS = 1 
+					AND p.STATUS = 1 and f.status=4
 			WHERE
 				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
@@ -143,7 +143,7 @@ FROM
 				wsm_sale_return e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
 				AND k.is_del = 0 
-				AND k.STATUS = 1 
+				AND k.STATUS = 1 and e.status=4
 			WHERE
 				k.itemid = c.id 
 				AND e.platform_id = a.platform_id 
@@ -154,7 +154,7 @@ FROM
 				wsm_order_back f
 				LEFT JOIN wsm_depart_user p ON f.apply_id = p.uid 
 				AND p.is_del = 0 
-				AND p.STATUS = 1 
+					AND p.STATUS = 1 and f.status=4
 			WHERE
 				p.itemid = c.id 
 				AND f.platform_id = a.platform_id