修复过期展示

app/Http/Services/SkuService.php

@@ -83,7 +83,12 @@ class SkuService extends BaseService
                     $sku['audit_user'] = $auditData[$goodsId]['audit_name'];
                     $sku['audit_user'] = $auditData[$goodsId]['audit_name'];
                 }
                 }
                 // 按SKU上架有效期是否超过当前时间计算是否过期
                 // 按SKU上架有效期是否超过当前时间计算是否过期
+                if (empty($sku['cp_time'])) {
+                    $sku['is_expire'] = -1;
+                } else {
                     $sku['is_expire'] = (!empty($sku['cp_time']) && $sku['cp_time'] < time()) ? 1 : 0;
                     $sku['is_expire'] = (!empty($sku['cp_time']) && $sku['cp_time'] < time()) ? 1 : 0;
+                }
+
                 $spu = json_decode($spuRedis->hget('spu', $sku['spu_id']), true);
                 $spu = json_decode($spuRedis->hget('spu', $sku['spu_id']), true);
                 $sku['spu_name'] = $spu['spu_name'];
                 $sku['spu_name'] = $spu['spu_name'];
                 //型号处理
                 //型号处理
@@ -160,7 +165,7 @@ class SkuService extends BaseService
                 $item['moq'] = $item['moq'] ?: 0;
                 $item['moq'] = $item['moq'] ?: 0;
                 $item['stock'] = $item['stock'] ?: 0;
                 $item['stock'] = $item['stock'] ?: 0;
                 $item['cp_time'] = $item['cp_time'] ? date('Y-m-d H:i:s', $item['cp_time']) : '';
                 $item['cp_time'] = $item['cp_time'] ? date('Y-m-d H:i:s', $item['cp_time']) : '';
-                $item['is_expire_name'] = !empty($item['is_expire']) ? '是' : '否';
+                $item['is_expire_name'] = array_get(config('field.SkuIsExpire'), $item['is_expire'], '');
                 $goodsTag = $redis->hget('goods_tag', $item['goods_id']);
                 $goodsTag = $redis->hget('goods_tag', $item['goods_id']);
                 $goodsTag = $goodsTag ? json_decode($goodsTag, true) : '';
                 $goodsTag = $goodsTag ? json_decode($goodsTag, true) : '';
                 $item['sku_tags'] = $goodsTag ? array_get($goodsTag, 'customer_tag') : '';
                 $item['sku_tags'] = $goodsTag ? array_get($goodsTag, 'customer_tag') : '';

config/field.php

@@ -408,4 +408,9 @@ return [
         '陈雪梅',
         '陈雪梅',
         '李新华',
         '李新华',
     ],
     ],
+    'SkuIsExpire' => [
+        0 => '未过期',
+        1 => '已过期',
+        -1 => ''
+    ],
 ];
 ];

resources/views/web/sku/SkuListFilter.blade.php

@@ -141,7 +141,7 @@
             </div>
             </div>
             <div class="layui-inline">
             <div class="layui-inline">
                 @inject('statusPresenter','App\Presenters\StatusPresenter')
                 @inject('statusPresenter','App\Presenters\StatusPresenter')
-                {!! $statusPresenter->render('is_expire','是否过期',request()->get('is_expire'),[-1=>'否',1=>'是']) !!}
+                {!! $statusPresenter->render('is_expire','是否过期',request()->get('is_expire'),[-1=>'',1=>'是',0=>'否']) !!}
             </div>
             </div>
             <div class="layui-inline">
             <div class="layui-inline">
                 @inject('statusPresenter','App\Presenters\StatusPresenter')
                 @inject('statusPresenter','App\Presenters\StatusPresenter')