修改

Model/Commission/MCommissionCalculate.Class.php

@@ -1344,6 +1344,9 @@ class MCommissionCalculate
 
         return ResultWrapper::success('操作成功');
     }
+    public function updateBalanceNew(int $orderId){
+        
+    }
 
     /**
      * Doc: (des="订单完成将等待入账转移到余额")

Model/GoodsManage/MGoodsBasic.Class.php

@@ -2350,7 +2350,8 @@ class MGoodsBasic extends MBaseModel
         }
 
         if (isset($selectParams['shopId']) && !empty($selectParams['shopId'])){
-            $sql .= ' AND b.storeId = '.$selectParams['shopId'];
+//            $sql .= ' AND b.storeId = '.$selectParams['shopId'];
+            $sql .= ' AND b.storeId in ('.$selectParams['shopId'].',0)';
         }
         
         if( isset($selectParams['merchantId']) ){