修改

Model/Goods/BasicAndSkuCache.Class.php

@@ -46,7 +46,7 @@ trait BasicAndSkuCache
                     ON b.brandId=d.id WHERE b.id = " . $this->objectId;
         $goodsBasicResult = $this->objDGoodsBasic->query($sql);
         if ($goodsBasicResult === false) {
-            file_put_contents('/apps/logs/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '错误|sql: ' . $this->objDGoodsBasic->error() . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '错误|sql: ' . $this->objDGoodsBasic->error() . PHP_EOL, FILE_APPEND);
             return false;
         }
 
@@ -58,7 +58,7 @@ trait BasicAndSkuCache
             $cacheResult = $this->objGoodsBasicRelevant->cacheBasicIdRelationName($cacheMap, $this->objectId);
             if (!$cacheResult->isSuccess()) {
                 //缓存写入失败
-                file_put_contents('/apps/logs/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '错误|cache缓存失败,基础资料id:' . $this->objectId . PHP_EOL, FILE_APPEND);
+                file_put_contents('/www/wwwroot/logs/api.liuniukj.com/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '错误|cache缓存失败,基础资料id:' . $this->objectId . PHP_EOL, FILE_APPEND);
                 return false;
             }
         }
@@ -109,7 +109,7 @@ trait BasicAndSkuCache
 
         $skuResult = $this->objDSku->select(['id' => array_values(array_unique($this->updateSku))]);
         if ($skuResult === false) {
-            file_put_contents('/apps/logs/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '错误原因|sql: ' . $this->objDSku->error() . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '错误原因|sql: ' . $this->objDSku->error() . PHP_EOL, FILE_APPEND);
             return true;
         }
         foreach ($skuResult as $sku) {
@@ -117,7 +117,7 @@ trait BasicAndSkuCache
             $this->objSkuCache->delSku($sku['id']);
             $cacheRes = $this->objSkuCache->cacheSku($sku['id'], $cacheMap);
             if (!$cacheRes->isSuccess()) {
-                file_put_contents('/apps/logs/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '缓存失败|error: ' . $sku['id'] . PHP_EOL, FILE_APPEND);
+                file_put_contents('/www/wwwroot/logs/api.liuniukj.com/BasicAndSkuCache_error.log', date('Y-m-d H:i:s') . '缓存失败|error: ' . $sku['id'] . PHP_EOL, FILE_APPEND);
                 return false;
             }
         }

Model/Goods/MGoods.Class.php

@@ -553,7 +553,7 @@ class MGoods extends MBaseModel
             if (isset($result['_shards']) && isset($result['_shards']['successful']) && $result['_shards']['successful'] == 1) {
                 //echo "es操作成功";die;
             } else {
-                file_put_contents('/apps/logs/elasticsearch.log', date('Y-m-d H:i:s') . '操作商品es错误，错误原因' . var_export($result, true) . PHP_EOL, FILE_APPEND);
+                file_put_contents('/www/wwwroot/logs/api.liuniukj.com/elasticsearch.log', date('Y-m-d H:i:s') . '操作商品es错误，错误原因' . var_export($result, true) . PHP_EOL, FILE_APPEND);
 
             }
         }
@@ -1235,6 +1235,7 @@ class MGoods extends MBaseModel
                   select  '.$fields.' from '.$goodsTab.' g left join '.$goodsBasicTab.' b on g.basicGoodsId = b.id
                 where g.deleteStatus= '.StatusCode::$standard.'  and b.deleteStatus ='.StatusCode::$standard.$where.') tmp LEFT JOIN '.$shopTab.' s on s.id = tmp.shopId left join `'.$stockDbName.'`.'.$inventoryWarehouse.' i on i.materielId = tmp.basicGoodsId
                 where tmp.deleteStatus='.StatusCode::$standard.$whereSql.$order.$limit;
+
         $dbResult = $this->objDGoods->query($sql);
         if ($dbResult === false) {
             return ResultWrapper::fail($this->objDGoods->error(), ErrorCode::$dberror);

Model/Goods/MQuickGoods.Class.php

@@ -550,7 +550,7 @@ class MQuickGoods extends MBaseModel
         $materielResult = $this->objMInventory->getInventoryByMaterielIds([$data['basicGoodsId']]);
         $materielMap = [];
         if (!$materielResult->isSuccess()){
-            file_put_contents('/apps/logs/MQuickGoods_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 ：' . var_export($materielResult->getData()) . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/MQuickGoods_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 ：' . var_export($materielResult->getData()) . PHP_EOL, FILE_APPEND);
         }else{
             $materielMap = $materielResult->getData();
         }

Model/GoodsManage/MGoodsBasic.Class.php

@@ -324,7 +324,7 @@ class MGoodsBasic extends MBaseModel
             if (isset($result['_shards']) && isset($result['_shards']['successful']) && $result['_shards']['successful'] == 1) {
                 //echo "es操作成功";die;
             } else {
-                file_put_contents('/apps/logs/elasticsearch.log', date('Y-m-d H:i:s') . '操作商品资料es错误，错误原因' . var_export($result, true) . PHP_EOL, FILE_APPEND);
+                file_put_contents('/www/wwwroot/logs/api.liuniukj.com/elasticsearch.log', date('Y-m-d H:i:s') . '操作商品资料es错误，错误原因' . var_export($result, true) . PHP_EOL, FILE_APPEND);
             }*/
         }
     }
@@ -904,7 +904,7 @@ class MGoodsBasic extends MBaseModel
         $InventoryResult = $this->objMInventory->getInventoryBySkuIds(array_column($data['specMultiple'], 'id'));
         $inventoryData = [];
         if (!$InventoryResult->isSuccess()) {
-            file_put_contents('/apps/logs/MGoodsBasic_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 ：' . $InventoryResult->getData() . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/MGoodsBasic_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 ：' . $InventoryResult->getData() . PHP_EOL, FILE_APPEND);
         } else {
             $inventoryData = $InventoryResult->getData();
         }
@@ -921,7 +921,7 @@ class MGoodsBasic extends MBaseModel
         $materielResult = $this->objMInventory->getInventoryByMaterielIds([$data['id']]);
         $materielMap = [];
         if (!$materielResult->isSuccess()) {
-            file_put_contents('/apps/logs/MGoodsBasic_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 ：' . var_export($materielResult->getData()) . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/MGoodsBasic_error.log', date('Y-m-d H:i:s') . '错误信息|sql错误 ：' . var_export($materielResult->getData()) . PHP_EOL, FILE_APPEND);
         } else {
             $materielMap = $materielResult->getData();
         }
@@ -1115,7 +1115,7 @@ class MGoodsBasic extends MBaseModel
             ]
         );
         if (!$skuResult->isSuccess()) {
-            file_put_contents('/apps/logs/MGoodsBasic_error.log', date('Y-m-d H:i:s') . '错误原因|sql:' . $skuResult->getData() . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/MGoodsBasic_error.log', date('Y-m-d H:i:s') . '错误原因|sql:' . $skuResult->getData() . PHP_EOL, FILE_APPEND);
             return $data;
         }
         $skuData = $skuResult->getData();
@@ -1905,7 +1905,7 @@ class MGoodsBasic extends MBaseModel
         $dsl = $this->setSearchWhere($selectParams);
         $result = $this->objDGoodsBasic->getSearchQueryDsl($dsl);
         if (isset($result['status']) && $result['status'] == 400) {
-            file_put_contents('/apps/logs/elasticsearch.log', date('Y-m-d H:i:s') . '获取基本资料失败，错误原因' . var_export($result, true) . PHP_EOL, FILE_APPEND);
+            file_put_contents('/www/wwwroot/logs/api.liuniukj.com/elasticsearch.log', date('Y-m-d H:i:s') . '获取基本资料失败，错误原因' . var_export($result, true) . PHP_EOL, FILE_APPEND);
             if ($result['error']['reason'] == 'all shards failed') {
                 return ResultWrapper::success([]);
             }
@@ -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']) ){