|
|
@@ -162,36 +162,36 @@ class GoodsService extends BaseService
|
|
|
$skuInfo = SupplyService::make()->getApiData('getSkuDetail', ['sku_sn' => $goodsSkuSn]);
|
|
|
if ($skuInfo) {
|
|
|
$updateData = ['sku_sn'=> $goodsSkuSn,'update_time' => time(),'mark'=>1, 'last_update_at' => $item['update_time']];
|
|
|
- if (isset($item['sku_name']) && $item['sku_name']) {
|
|
|
- $updateData['sku_name'] = $item['sku_name'];
|
|
|
+ if (isset($skuInfo['sku_name']) && $skuInfo['sku_name']) {
|
|
|
+ $updateData['sku_name'] = $skuInfo['sku_name'];
|
|
|
}
|
|
|
- if (isset($item['main_img']) && $item['main_img']) {
|
|
|
- $updateData['main_img'] = $item['main_img'];
|
|
|
+ if (isset($skuInfo['main_img']) && $skuInfo['main_img']) {
|
|
|
+ $updateData['main_img'] = $skuInfo['main_img'];
|
|
|
}
|
|
|
- if (isset($item['spu_sn']) && $item['spu_sn']) {
|
|
|
- $updateData['spu_sn'] = $item['spu_sn'];
|
|
|
+ if (isset($skuInfo['spu_sn']) && $skuInfo['spu_sn']) {
|
|
|
+ $updateData['spu_sn'] = $skuInfo['spu_sn'];
|
|
|
}
|
|
|
- if (isset($item['status']) && $item['status']) {
|
|
|
- $updateData['status'] = intval($item['status']);
|
|
|
+ if (isset($skuInfo['status']) && $skuInfo['status']) {
|
|
|
+ $updateData['status'] = intval($skuInfo['status']);
|
|
|
}
|
|
|
- if (isset($item['retail_price']) && $item['retail_price']) {
|
|
|
- $updateData['retail_price'] = floatval($item['retail_price']);
|
|
|
+ if (isset($skuInfo['retail_price']) && $skuInfo['retail_price']) {
|
|
|
+ $updateData['retail_price'] = floatval($skuInfo['retail_price']);
|
|
|
}
|
|
|
- if (isset($item['plat_price']) && $item['plat_price']) {
|
|
|
- $updateData['plat_price'] = floatval($item['plat_price']);
|
|
|
+ if (isset($skuInfo['plat_price']) && $skuInfo['plat_price']) {
|
|
|
+ $updateData['plat_price'] = floatval($skuInfo['plat_price']);
|
|
|
}
|
|
|
- if (isset($item['detail_img']) && $item['detail_img']) {
|
|
|
- $updateData['detail_img'] = json_encode($item['detail_img'], 256);
|
|
|
+ if (isset($skuInfo['detail_img']) && $skuInfo['detail_img']) {
|
|
|
+ $updateData['detail_img'] = json_encode($skuInfo['detail_img'], 256);
|
|
|
}
|
|
|
- if (isset($item['attr']) && $item['attr']) {
|
|
|
- $updateData['attr'] = json_encode($item['attr'], 256);
|
|
|
+ if (isset($skuInfo['attr']) && $skuInfo['attr']) {
|
|
|
+ $updateData['attr'] = json_encode($skuInfo['attr'], 256);
|
|
|
}
|
|
|
|
|
|
- if($this->model->where(['goods_id' => $goodsId])->value('id')){
|
|
|
- $this->model->where(['goods_id' => $goodsId, 'mark' => 1])->update($updateData);
|
|
|
+ if(GoodsSkuModel::where(['goods_id' => $goodsId])->value('id')){
|
|
|
+ GoodsSkuModel::where(['goods_id' => $goodsId, 'mark' => 1])->update($updateData);
|
|
|
}else{
|
|
|
$updateData['goods_id'] = $goodsId;
|
|
|
- $this->model->insert($updateData);
|
|
|
+ GoodsSkuModel::insert($updateData);
|
|
|
}
|
|
|
|
|
|
$updated++;
|
|
|
@@ -205,7 +205,7 @@ class GoodsService extends BaseService
|
|
|
unset($item);
|
|
|
RedisService::set($cacheKey . '_page', $page, rand(300, 600));
|
|
|
}else{
|
|
|
- RedisService::set($cacheKey . '_page', 1, rand(300, 600));
|
|
|
+ RedisService::set($cacheKey . '_page', 0, rand(300, 600));
|
|
|
}
|
|
|
|
|
|
return ['count' => count($goods), 'updated' => $updated, 'errorCount' => $error,'page'=>$page];
|
|
|
@@ -304,14 +304,14 @@ class GoodsService extends BaseService
|
|
|
}
|
|
|
unset($item);
|
|
|
} else {
|
|
|
- RedisService::set($cacheKey . '_page', 1, rand(300, 600));
|
|
|
+ RedisService::set($cacheKey . '_page', 0, rand(300, 600));
|
|
|
}
|
|
|
|
|
|
if ($goods) {
|
|
|
RedisService::set($cacheKey . '_page', $page, rand(300, 600));
|
|
|
RedisService::set($cacheKey, $goods, rand(5, 10));
|
|
|
- if(!$this->model->insertAll($goods)){
|
|
|
-
|
|
|
+ if(!$this->model->insertAll($goods) && $skus){
|
|
|
+ GoodsSkuModel::insertAll($skus);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -362,7 +362,7 @@ class GoodsService extends BaseService
|
|
|
}
|
|
|
unset($item);
|
|
|
} else {
|
|
|
- RedisService::set($cacheKey . '_page', 1, rand(300, 600));
|
|
|
+ RedisService::set($cacheKey . '_page', 0, rand(300, 600));
|
|
|
}
|
|
|
|
|
|
if ($categorys) {
|