平台后台--订单概括--生活区和复购区mer_id的bug进行修复

app/common/repositories/finance/FinanceRepository.php

@@ -157,7 +157,7 @@ class FinanceRepository extends BaseRepository
 
             // 会员专区订单总数
             //总数
-            $mer_id = 496;
+            $mer_idhy = 496;
             $chengjiaomoney = Db::name('store_order')->where($where)->where('mer_id', 496)->count();
             $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 496)->count();
             $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 496)->count();
@@ -166,7 +166,7 @@ class FinanceRepository extends BaseRepository
     
             //精彩生活区订单总数
             //总数
-            $mer_id = 439;
+            $mer_idjc = 439;
             $chengjiaocount = Db::name('store_order')->where($where)->where('mer_id', 439)->count();
             $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 439)->count();
             $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 439)->count();
@@ -183,7 +183,7 @@ class FinanceRepository extends BaseRepository
     
             //复购区订单总数
             //总数
-            $mer_id = 491;
+            $mer_idfg = 491;
             $tuikuanmoney = Db::name('store_order')->where($where)->where('mer_id', 491)->count();
             $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 491)->count();
             $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 491)->count();
@@ -249,10 +249,10 @@ class FinanceRepository extends BaseRepository
             $list6[] = ['count' => $todayCount, 'name' => '日订单总数'];
     
     
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'mer_id' => $mer_id, 'list' => $list1];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'mer_id' => $mer_id, 'list' => $list2];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'mer_id' => $mer_idhy, 'list' => $list1];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'mer_id' => $mer_idjc, 'list' => $list2];
             $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '商贸区订单总数', 'list' => $list3];
-            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'mer_id' => $mer_id, 'list' => $list4];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'mer_id' => $mer_idfg, 'list' => $list4];
             $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '三方平台订单总数', 'list' => $list5];
             $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '线下订单总数', 'list' => $list6];
             return $data;