唯微宝更改

app/controller/admin/gong/Goods.php

@@ -105,8 +105,6 @@ class Goods extends BaseController
     // 获取选品库中全部、已加入3号库、未加入3号库的数量
     public function getStatusFilter()
     {
-   
-   
         // 获取全部数据
         $allNum =  Db::name('douhuomall')->whereIn('status', [0, 1])->count();
         // 获取已加入3号库的数据
@@ -116,21 +114,21 @@ class Goods extends BaseController
 
 
         $res = [
-            [
-                'type' => 0,
-                'title' => '全部',
-                'count' => $allNum
-            ],
-            [
-                'type' => 1,
-                'title' => '已加入3号库',
-                'count' => $joinNum
-            ],
-            [
-                'type' => 2,
-                'title' => '未加入3号库',
-                'count' => $notJoinNum
-            ]
+            // [
+            //     'type' => 0,
+            //     'title' => '全部',
+            //     'count' => $allNum
+            // ],
+            // [
+            //     'type' => 1,
+            //     'title' => '已加入3号库',
+            //     'count' => $joinNum
+            // ],
+            // [
+            //     'type' => 2,
+            //     'title' => '未加入3号库',
+            //     'count' => $notJoinNum
+            // ]
         ];
         return app('json')->success($res);
     }

app/controller/api/douhuomall/Take.php

@@ -62,7 +62,8 @@ class Take
                 foreach ($skuInfo as $k=>$v) {
                     $skuInfo[$k]['cost_price'] = bcadd($v['plat_price'], bcmul($v['plat_price'], 0.03, 2),2);//成本价格 原来进价的基础上加百分之3
                     $skuInfo[$k]['market_price'] = bcadd($skuInfo[$k]['cost_price'], bcmul($skuInfo[$k]['cost_price'], 0.2, 2),2);//销售价格  售价在成本价格的基础上加百分20
-                    $skuInfo[$k]['profit'] = bcdiv($skuInfo[$k]['cost_price'], $skuInfo[$k]['market_price'], 2);
+                    $skuInfo[$k]['profit'] = bcdiv($skuInfo[$k]['market_price'], $skuInfo[$k]['cost_price'], 2);
+                    $skuInfo[$k]['mer_profit'] = bcsub($skuInfo[$k]['market_price'], $skuInfo[$k]['cost_price'], 2);
                     $skuInfo[$k]['yanglaojin'] = '0.00';
                     if(count($v['attr'])){
                         $skuInfo[$k]['attribute_json'] = $v['attr'];
@@ -182,9 +183,9 @@ class Take
             $data['cost_price'] = isset($skuInfo[0]['cost_price']) ? $skuInfo[0]['cost_price'] : 0;
             $data['market_price'] = isset($skuInfo[0]['market_price']) ? $skuInfo[0]['market_price'] : 0;
             $data['ot_price'] = isset($skuInfo[0]['retail_price']) ? $skuInfo[0]['retail_price'] : 0;
-            $data['mer_profit'] = isset($skuInfo[0]['profit']) ? $skuInfo[0]['profit'] : 0;
+            $data['mer_profit'] = isset($skuInfo[0]['mer_profit']) ? $skuInfo[0]['mer_profit'] : 0;
             $data['pension'] = isset($skuInfo[0]['yanglaojin']) ? $skuInfo[0]['yanglaojin'] : 0;
-            $data['profit'] = empty($data['cost_price']) || empty($data['market_price']) ? 0 : bcdiv($data['cost_price'], $data['market_price'], 2);
+            $data['profit'] = empty($data['cost_price']) || empty($data['market_price']) ? 0 : bcdiv($data['market_price'], $data['cost_price'], 2);
             if (empty($findData)) {
                 $data['skuId_info'] = json_encode($data['skuId_info']);
                 $data['spuId_info'] = json_encode($data['spuId_info']);