Skip to content

杨树贤 / liexin_supplier

Go to a project
Commit e732be78 by 杨树贤
Options

修复

parent 393ad618
Inline Side-by-side
Showing with 53 additions and 31 deletions
app/Http/Services/SkuService.php
...@@ -33,7 +33,11 @@ class SkuService extends BaseService ...@@ -33,7 +33,11 @@ class SkuService extends BaseService
$url = env('ES_SKU_URL', ''); $url = env('ES_SKU_URL', '');
$map['show_status'] = 1; $map['show_status'] = 1;
$map['no_rule'] = 1122; $map['no_rule'] = 1122;
$return = curl($url, $map, 1); try {
$return = curl($url, $map, 1);
} catch (\Exception $e) {
return [$e->getMessage()];
}
$data = json_decode($return, true); $data = json_decode($return, true);
$list = []; $list = [];
...@@ -76,8 +80,10 @@ class SkuService extends BaseService ...@@ -76,8 +80,10 @@ class SkuService extends BaseService
if ($brand) { if ($brand) {
$sku['brand_name'] = $brand; $sku['brand_name'] = $brand;
} else { } else {
$brand = DB::connection('spu')->table('brand')->where('brand_id', $brand = DB::connection('spu')->table('brand')->where(
$spu['brand_id'])->lists('brand_name', 'brand_id'); 'brand_id',
$spu['brand_id']
)->lists('brand_name', 'brand_id');
if ($brand) { if ($brand) {
$sku['brand_name'] = $brand[$spu['brand_id']]; $sku['brand_name'] = $brand[$spu['brand_id']];
} }
...@@ -179,10 +185,14 @@ class SkuService extends BaseService ...@@ -179,10 +185,14 @@ class SkuService extends BaseService
$validSkuTags[] = $tag; $validSkuTags[] = $tag;
} }
} }
$sku['invalid_sku_tags'] = $invalidSkuTags ? implode(',', $sku['invalid_sku_tags'] = $invalidSkuTags ? implode(
$invalidSkuTags) : ''; ',',
$sku['valid_sku_tags'] = $validSkuTags ? implode(',', $invalidSkuTags
$validSkuTags) : ''; ) : '';
$sku['valid_sku_tags'] = $validSkuTags ? implode(
',',
$validSkuTags
) : '';
} }
unset($sku); unset($sku);
return $skuList; return $skuList;
...@@ -236,44 +246,56 @@ class SkuService extends BaseService ...@@ -236,44 +246,56 @@ class SkuService extends BaseService
//批量上下架队列 //批量上下架队列
public function batchOffShelfSkuQueue($data) public function batchOffShelfSkuQueue($data)
{ {
$conn = new AMQPStreamConnection(config('database.connections.rabbitmq2.host'), $conn = new AMQPStreamConnection(
config('database.connections.rabbitmq2.host'),
config('database.connections.rabbitmq2.port'), config('database.connections.rabbitmq2.port'),
config('database.connections.rabbitmq2.login'), config('database.connections.rabbitmq2.login'),
config('database.connections.rabbitmq2.password')); config('database.connections.rabbitmq2.password')
);
$channel = $conn->channel(); $channel = $conn->channel();
$channel->queue_declare('lie_footstone_batch_downsku_queue', false, true, false, false); $channel->queue_declare('lie_footstone_batch_downsku_queue', false, true, false, false);
$msg = new AMQPMessage(json_encode($data), $msg = new AMQPMessage(
array('content_type' => 'text/plain')); json_encode($data),
array('content_type' => 'text/plain')
);
$channel->basic_publish($msg, '', 'lie_footstone_batch_downsku_queue'); $channel->basic_publish($msg, '', 'lie_footstone_batch_downsku_queue');
} }
//批量修改内部编码 //批量修改内部编码
public function batchUpdateEncodedQueue($data) public function batchUpdateEncodedQueue($data)
{ {
$conn = new AMQPStreamConnection(config('database.connections.rabbitmq2.host'), $conn = new AMQPStreamConnection(
config('database.connections.rabbitmq2.host'),
config('database.connections.rabbitmq2.port'), config('database.connections.rabbitmq2.port'),
config('database.connections.rabbitmq2.login'), config('database.connections.rabbitmq2.login'),
config('database.connections.rabbitmq2.password')); config('database.connections.rabbitmq2.password')
);
$channel = $conn->channel(); $channel = $conn->channel();
$channel->queue_declare('lie_footstone_update_sku_info_queue', false, true, false, false); $channel->queue_declare('lie_footstone_update_sku_info_queue', false, true, false, false);
$msg = new AMQPMessage(json_encode($data), $msg = new AMQPMessage(
array('content_type' => 'text/plain')); json_encode($data),
array('content_type' => 'text/plain')
);
$channel->basic_publish($msg, '', 'lie_footstone_update_sku_info_queue'); $channel->basic_publish($msg, '', 'lie_footstone_update_sku_info_queue');
} }
//批量修改商品信息队列 //批量修改商品信息队列
public function batchUpdateSkuInfoQueue($data) public function batchUpdateSkuInfoQueue($data)
{ {
$conn = new AMQPStreamConnection(config('database.connections.rabbitmq2.host'), $conn = new AMQPStreamConnection(
config('database.connections.rabbitmq2.host'),
config('database.connections.rabbitmq2.port'), config('database.connections.rabbitmq2.port'),
config('database.connections.rabbitmq2.login'), config('database.connections.rabbitmq2.login'),
config('database.connections.rabbitmq2.password')); config('database.connections.rabbitmq2.password')
);
$channel = $conn->channel(); $channel = $conn->channel();
$channel->queue_declare('lie_footstone_update_sku_info_queue', false, true, false, false); $channel->queue_declare('lie_footstone_update_sku_info_queue', false, true, false, false);
$msg = new AMQPMessage(json_encode($data), $msg = new AMQPMessage(
array('content_type' => 'text/plain')); json_encode($data),
array('content_type' => 'text/plain')
);
$channel->basic_publish($msg, '', 'lie_footstone_update_sku_info_queue'); $channel->basic_publish($msg, '', 'lie_footstone_update_sku_info_queue');
} }
...@@ -440,7 +462,6 @@ class SkuService extends BaseService ...@@ -440,7 +462,6 @@ class SkuService extends BaseService
$ruler['upload_futures_goods_validity_period'] = $futuresCpTimeDay; $ruler['upload_futures_goods_validity_period'] = $futuresCpTimeDay;
$ruler = json_encode($ruler); $ruler = json_encode($ruler);
$redis->hset('supplier_sku_upload_ruler_v2', $supplierId, $ruler); $redis->hset('supplier_sku_upload_ruler_v2', $supplierId, $ruler);
} }
$cpTimeDayStr = $cpTimeDay == -1 ? '无限制' : $cpTimeDay; $cpTimeDayStr = $cpTimeDay == -1 ? '无限制' : $cpTimeDay;
(new LogService())->BatchAddIgnoreAuditLogs($supplierIdList, LogModel::UPDATE_OPERATE, '批量配置供应商sku上架有效期', '上架有效期修改为' . $cpTimeDayStr . '天,期货有效期修改为' . $futuresCpTimeDay . '天'); (new LogService())->BatchAddIgnoreAuditLogs($supplierIdList, LogModel::UPDATE_OPERATE, '批量配置供应商sku上架有效期', '上架有效期修改为' . $cpTimeDayStr . '天,期货有效期修改为' . $futuresCpTimeDay . '天');
...@@ -478,10 +499,7 @@ class SkuService extends BaseService ...@@ -478,10 +499,7 @@ class SkuService extends BaseService
} }
//设置供应商相关sku的队列数据 //设置供应商相关sku的队列数据
public function setSupplierSkuCpTimeLimitQueue($supplier) public function setSupplierSkuCpTimeLimitQueue($supplier) {}
{
}
public function batchUpdateGoodsLabel($type, $supplierCode, $skuIds, $goodsLabel) public function batchUpdateGoodsLabel($type, $supplierCode, $skuIds, $goodsLabel)
...@@ -504,21 +522,25 @@ class SkuService extends BaseService ...@@ -504,21 +522,25 @@ class SkuService extends BaseService
if (!is_array($skuIds)) { if (!is_array($skuIds)) {
$skuIds = explode(',', trim($skuIds)); $skuIds = explode(',', trim($skuIds));
} }
$conn = new AMQPStreamConnection(config('database.connections.rabbitmqSku.host'), $conn = new AMQPStreamConnection(
config('database.connections.rabbitmqSku.host'),
config('database.connections.rabbitmqSku.port'), config('database.connections.rabbitmqSku.port'),
config('database.connections.rabbitmqSku.login'), config('database.connections.rabbitmqSku.login'),
config('database.connections.rabbitmqSku.password')); config('database.connections.rabbitmqSku.password')
);
foreach ($skuIds as $skuId) { foreach ($skuIds as $skuId) {
$channel = $conn->channel(); $channel = $conn->channel();
$channel->queue_declare('lie_footstone_update_sku_info_queue', false, true, false, false); $channel->queue_declare('lie_footstone_update_sku_info_queue', false, true, false, false);
if (empty($skuId)) { if (empty($skuId)) {
continue; continue;
} }
$msg = new AMQPMessage(json_encode([[ $msg = new AMQPMessage(
'goods_id' => $skuId, json_encode([[
'goods_label' => $goodsLabel, 'goods_id' => $skuId,
]]), 'goods_label' => $goodsLabel,
array('content_type' => 'text/plain')); ]]),
array('content_type' => 'text/plain')
);
$channel->basic_publish($msg, '', 'sku_update'); $channel->basic_publish($msg, '', 'sku_update');
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment