Skip to content

G
goods
Commit 4cfe1fd6 authored by luhongguang's avatar luhongguang
Browse files
Options

Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

parents 9809db81 a00d7975
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
application/services/marketing/MarketingService.php
View file @ 4cfe1fd6
...@@ -47,12 +47,13 @@ class MarketingService ...@@ -47,12 +47,13 @@ class MarketingService
$tmpGoodsSkuId = array_column($marketingGoodsList, 'goods_sku_id'); $tmpGoodsSkuId = array_column($marketingGoodsList, 'goods_sku_id');
} }
$where = [ $where = [
'online_status' => 1, 'online_status' => 1,
]; ];
if (!empty($tmpGoodsSkuId)) { if (!empty($tmpGoodsSkuId)) {
$where['goods_sku_id[!=]'] = $tmpGoodsSkuId; $where['goods_sku_id[!]'] = $tmpGoodsSkuId;
} }
if (!empty($goodsSkuId)) { if (!empty($goodsSkuId)) {
......
deploy/start_env/start_api.sh
View file @ 4cfe1fd6
...@@ -92,6 +92,7 @@ if [ ! -f "/home/services/api.go2yd.com/logs/fpm-slow.log" ];then ...@@ -92,6 +92,7 @@ if [ ! -f "/home/services/api.go2yd.com/logs/fpm-slow.log" ];then
fi fi
chmod -R 777 /home/services/api.go2yd.com/logs chmod -R 777 /home/services/api.go2yd.com/logs
chown -R nobody:nobody /home/services/api.go2yd.com/logs chown -R nobody:nobody /home/services/api.go2yd.com/logs
chmod -R 777 /home/services/api.go2yd.com/htdocs/Website/data/tmp
#add apc.php to the web root #add apc.php to the web root
#可选PHP缓存 APC的缓存分两部分:系统缓存和用户数据缓存 #可选PHP缓存 APC的缓存分两部分:系统缓存和用户数据缓存
......
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 to comment