Merge branch 'dev' of https://git.bjtdba.com/shop/php into dev

app/common/middleware/InstallMiddleware.php

@@ -21,6 +21,19 @@ class InstallMiddleware extends BaseMiddleware
 
     public function before(Request $request)
     {
+        // 系统维护开关（示例条件，实际应根据配置）
+        $isMaintenance = false; // 改为从配置读取
+
+        if ($isMaintenance) {
+            // 创建符合前端格式的响应
+            $response = json([
+                'status' => 400,
+                'message' => '系统正在升级中'
+            ], 503); // 使用503状态码表示服务不可用
+
+            // 抛出异常中断请求
+            throw new HttpResponseException($response);
+        }
         if(!file_exists(__DIR__.'/../../../install/install.lock')){
             throw new HttpResponseException( Response::create('/install.html', 'redirect')->code(302));
         }

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

@@ -1044,7 +1044,7 @@ class ProductRepository extends BaseRepository
                 $s = 8000;
             }
 
-            $res['yanglao'] = bcmul($s, 0.035, 2);  
+            $res['yanglao'] = bcmul($s, 0.035, 2);
         }
 
 
@@ -1337,7 +1337,7 @@ class ProductRepository extends BaseRepository
 //        echo Db::getlastsql();die;
         $list = $query->page($page, $limit)->setOption('field', [])->with(['issetCoupon'])->field('volunteer,product_id,cate_id,mer_id,image,store_name,sort,sales,price,create_time,keyword')->select();
         $arr=[];
-        foreach ($list["list"] as $v) {
+        foreach ($list as $v) {
             $k = $this->pvParm($v['product_id']);
 //            $v['yanglao'] = $yanglao;
 //            $v["yanglao"]
@@ -1351,7 +1351,7 @@ class ProductRepository extends BaseRepository
 //            array_push($v,$k);
             $arr[]=$v;
         }
-        $list["list"]=$arr;
+        $list=$arr;
         return compact('count', 'list');
     }
 
@@ -1969,7 +1969,7 @@ 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']])) {
@@ -1980,7 +1980,7 @@ class ProductRepository extends BaseRepository
                         // $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);
@@ -2068,7 +2068,7 @@ class ProductRepository extends BaseRepository
     // 供应链商品上下架
     public function changeStatus($ids, $is_show)
     {
-    
+
         if ($is_show == 1) {
             $data = ['is_show' => $is_show, 'is_status' => 0];
         } else {

app/controller/api/store/merchant/TaskPartnerProfits.php

@@ -128,7 +128,7 @@ class TaskPartnerProfits
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [37];
+        $zeroLineUidList = [];
         foreach ($zeroLineUidList as $uid) {
 
             //查询当前团队的用户列表

app/controller/api/store/merchant/Taskorderguquan.php

@@ -813,7 +813,7 @@ class Taskorderguquan
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [37];
+        $zeroLineUidList = [];
         foreach ($zeroLineUidList as $uid) {
             //查询当前团队的用户列表
             $sql = "select getUserLevelId($uid) as uids";

app/controller/api/store/merchant/Taskorderlianc.php

@@ -294,7 +294,7 @@ class Taskorderlianc
             ->toArray();
         $removeUserIdList = array_column($removeUserList, 'uid');
 
-        $zeroLineUidList = [37];
+        $zeroLineUidList = [];
         foreach ($zeroLineUidList as $uid) {
             //查询当前团队的用户列表
             $sql = "select getUserLevelId($uid) as uids";