Commit cc36f6cc authored by jianghaiming's avatar jianghaiming

update:Set

parent 3503115a
......@@ -101,7 +101,9 @@ class MarketingGoodsService
foreach ($data as $key => $value) {
$inventoryRest = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
if (!empty($inventoryRest)) {
$expirationTime = !empty($goodsSkuList[$value['goods_sku_id']]['expiration_time']) ? $goodsSkuList[$value['goods_sku_id']]['expiration_time'] : '';
if (!empty($inventoryRest) && $expirationTime> date("Y-m-d H:i:s")) {
$list[$i]['inventory_rest'] = !empty($goodsSkuList[$value['goods_sku_id']]['inventory_rest']) ? $goodsSkuList[$value['goods_sku_id']]['inventory_rest'] : '';
$list[$i] = $value;
$list[$i]['life_account_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['life_account_id']) ? $goodsSkuList[$value['goods_sku_id']]['life_account_id'] : '';
......
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