Merge branch 'master' into huangfamily

app/common/repositories/store/order/StoreOrderRepository.php

@@ -10689,6 +10689,6 @@ class StoreOrderRepository extends BaseRepository
         //{"user_groub":6,"rate":15,"name":"高级合伙人"},
         //{"user_groub":7,"rate":17,"name":"董事"}
         //]
-        return isset($group_rate[$spread_data['user_group']]) ? round($group_rate[$user_group] / 100, 2) : 0.00;
+        return isset($group_rate[$user_group]) ? round($group_rate[$user_group] / 100, 2) : 0.00;
     }
 }

app/common/repositories/store/product/ProductRepository.php

@@ -49,7 +49,7 @@ class ProductRepository extends BaseRepository
 {
 
     protected $dao;
-    protected $filed = 'concession_pri,product_id,mer_id,brand_id,unit_name,rate,reply_count,store_info,cate_id,ficti,image,slider_image,store_name,keyword,sort,is_show,sales,price,refusal,cost,ot_price,stock,is_gift_bag,care_count,status,is_used,create_time,seckill,plate_mer_profit,type';
+    protected $filed = 'is_status,concession_pri,product_id,mer_id,brand_id,unit_name,rate,reply_count,store_info,cate_id,ficti,image,slider_image,store_name,keyword,sort,is_show,sales,price,refusal,cost,ot_price,stock,is_gift_bag,care_count,status,is_used,create_time,seckill,plate_mer_profit,type';
 
     /**
      * ProductRepository constructor.
@@ -1944,16 +1944,18 @@ class ProductRepository extends BaseRepository
                 ->where('product_id', $product_id)
                 ->select()->toArray();
             $attrInfo = array_column($attrInfo, null, 'gong_sku_id');
-            $updateData = [];
+            $updateData = [];   
             // 组装数据
             foreach ($skuArr as $key => $value) {
                 if (isset($attrInfo[$value['sku_id']])) {
+
                     if ($value['edit_price'] > $attrInfo[$value['sku_id']]['gong_market_price']) {
                         // 上调价格计算创客利润
                         $diff = bcsub($value['edit_price'], $attrInfo[$value['sku_id']]['gong_market_price'], 2);
-                        $diff_profit = bcmul($diff, 0.7, 2);
+                        // $diff_profit = bcmul($diff, 0.7, 2);
+                        $diff_profit = $diff;
                         $plate_mer_profit = bcadd($attrInfo[$value['sku_id']]['gong_mer_profit'], $diff_profit, 2);
-                    } else {
+                    } else {    
                         // 下调价格计算创客利润
                         $diff = bcsub($attrInfo[$value['sku_id']]['gong_market_price'], $value['edit_price'], 2);
                         $plate_mer_profit = bcsub($attrInfo[$value['sku_id']]['gong_mer_profit'], $diff, 2);
@@ -2041,7 +2043,7 @@ class ProductRepository extends BaseRepository
     // 供应链商品上下架
     public function changeStatus($ids, $is_show)
     {
-        $data = ['is_show' => $is_show];
+        $data = ['is_show' => $is_show, 'is_status' => 1];
         $this->dao->updates($ids, $data);
 
         foreach ($ids as $id) {

app/controller/api/douhuomall/Take.php

@@ -94,8 +94,9 @@ class Take
             $this->remove($goodsIds);
             return 'sussess';
         } catch (Exception $e) {
-            Log::error('同步数据失败：' . $e->getMessage());
+            Log::error('供应链拉取数据：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】');
             echo '供应链拉取数据：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】';
+            Db::name('log')->insert(['data' => '供应链拉取数据：' . $e->getFile() . '：' . $e->getLine() . '【' . $e->getMessage() . '】']);
             return 'error';
         }
     }
@@ -124,9 +125,11 @@ class Take
         if (!is_dir($targetDir)) {
             mkdir($targetDir, 0777, true); // 第二个参数是权限，第三个参数是递归创建
         }
+
+        ini_set("max_execution_time", 2);
         
         // 获取远程图片内容
-        $imageContent = file_get_contents($remoteImageUrl);
+        $imageContent = @file_get_contents($remoteImageUrl);
         
         // 检查是否成功获取内容
         if ($imageContent !== false) {

app/controller/merchant/gong/Goods.php

@@ -320,10 +320,10 @@ class Goods extends BaseController
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
                     'gong_sku_id'=>$v['sku_id'],
-                    'gong_mer_profit' => $v['profit'],
+                    'gong_mer_profit' => $v['mer_profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],
-                    'plate_mer_profit' => $v['profit']
+                    'plate_mer_profit' => $v['mer_profit']
                 ]);
                 $key='';
                 $num++;
@@ -357,10 +357,10 @@ class Goods extends BaseController
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
                     'gong_sku_id'=>$v['sku_id'],
-                    'gong_mer_profit' => $v['profit'],
+                    'gong_mer_profit' => $v['mer_profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],
-                    'plate_mer_profit' => $v['profit']
+                    'plate_mer_profit' => $v['mer_profit']
                 ]);
                 $key='';
                 $num++;