ad

app/admin/controller/Good.php

@@ -121,7 +121,7 @@ class Good extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('good')
             ->alias("a")
-            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,a.good_info_img
+            ->field("b.skuCode,b.platform_code,b.plat_code,b.id as good_id,a.cat_id,a.good_name,a.good_img,a.good_thumb_img,a.good_info_img
             ,b.createrid,a.is_exclusive,a.brand_id,a.supplierNo,a.good_unit,a.noble_metal,a.companyNo,a.spuCode,a.good_type,
             b.creater,b.addtime,b.updatetime,b.exam_status,a.createrid purchase_id,a.creater purchase,u.itemid")//成本表里的创建人，也是线上商品的采购人，为了防止混淆，给creater取个别名
             ->leftJoin("good_platform b","a.spuCode=b.spuCode")

app/admin/controller/Stat.php

@@ -20,7 +20,7 @@ class Stat extends \app\BaseController
         $endtime = isset($post['date']) ? $post['date'] : date("Y-m-d");
 
         $sql = "
-   SELECT
+ SELECT
 	`month` AS m,
 	ifnull( month_total_fee, 0 ) AS total,
 	ifnull( `week`, '' ) AS w,
@@ -38,29 +38,19 @@ FROM
 	SELECT MONTH
 		( a.addtime ) AS `month`,
 		SUM( total_price ) AS month_total_fee,
-		((
+		(
 			SELECT
-			ifnull(sum(total_fee),0) 
+			ifnull(sum(e.th_fee),0) 
 			FROM
-				wsm_sale_return e
+				wsm_th_data e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
+				LEFT JOIN wsm_sale f on e.orderCode=f.orderCode
 				AND k.is_del = 0 
-				AND k.STATUS = 1 and e.status=4
+				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
-				AND e.platform_id = a.platform_id 
-				AND DATE_FORMAT( e.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' )) + (
-			SELECT
-			ifnull(sum(total_fee),0)  
-			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 f.status=4
-			WHERE
-				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
-			AND DATE_FORMAT( f.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' ))) AS month_thfee,
+				AND DATE_FORMAT( e.addtime, '%Y-%m' ) = DATE_FORMAT( '$endtime', '%Y-%m' )) AS month_thfee,
 		a.platform_id,
 		c.`name`,
 		c.id,
@@ -85,32 +75,19 @@ FROM
 	SELECT WEEK
 		( a.addtime, 1 ) AS `week`,
 		SUM( total_price ) AS week_total_fee,
-		((
-			SELECT
-				ifnull(sum(total_fee),0) 
+		(SELECT
+			ifnull(sum(e.th_fee),0) 
 			FROM
-				wsm_sale_return e
+				wsm_th_data e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
+				LEFT JOIN wsm_sale f on e.orderCode=f.orderCode
 				AND k.is_del = 0 
-				AND k.STATUS = 1 and e.status=4
+				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
-				AND e.platform_id = a.platform_id 
-				AND WEEK ( e.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
-				AND DATE_FORMAT ( e.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' )) + (
-			SELECT
-				ifnull(sum(total_fee),0) 
-			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 f.status=4
-			WHERE
-				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
 				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
-				AND DATE_FORMAT ( f.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' ) 
-			)) AS week_thfee,
+				AND DATE_FORMAT ( f.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' )) AS week_thfee,
 		a.platform_id,
 		c.`name`,
 		c.id,
@@ -136,29 +113,19 @@ FROM
 	SELECT
 		date_format( a.addtime, '%Y-%m-%d' ) AS `day`,
 		SUM( total_price ) AS day_total_fee,
-		((
-			SELECT
-				ifnull(sum(total_fee),0) 
+		(SELECT
+			ifnull(sum(e.th_fee),0) 
 			FROM
-				wsm_sale_return e
+				wsm_th_data e
 				LEFT JOIN wsm_depart_user k ON e.apply_id = k.uid 
+				LEFT JOIN wsm_sale f on e.orderCode=f.orderCode
 				AND k.is_del = 0 
-				AND k.STATUS = 1 and e.status=4
+				AND k.STATUS = 1 
 			WHERE
 				k.itemid = c.id 
-				AND e.platform_id = a.platform_id 
-				AND DATE_FORMAT( e.addtime, '%Y-%m-%d' ) = DATE_FORMAT( '$endtime', '%Y-%m-%d' )) + (
-			SELECT
-				ifnull(sum(total_fee),0) 
-			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 f.status=4
-			WHERE
-				p.itemid = c.id 
 				AND f.platform_id = a.platform_id 
-			AND DATE_FORMAT( f.addtime, '%Y-%m-%d' ) = DATE_FORMAT( '$endtime', '%Y-%m-%d' ))) AS day_thfee,
+				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
+				AND DATE_FORMAT( f.addtime, '%Y-%m-%d' ) = DATE_FORMAT( '$endtime', '%Y-%m-%d' )) AS day_thfee, 
 		a.platform_id,
 		c.`name`,
 		c.id AS depar_id,