|
@@ -223,13 +223,16 @@ class CustomerController extends Controller
|
223
|
223
|
$item['is_use'] = $value['is_use'];
|
224
|
224
|
$item['order_id'] = $value['order_id'];
|
225
|
225
|
if($value['is_use'] == 1){
|
226
|
|
- $item['status'] = 1;
|
227
|
|
- } else if(time() <= strtotime($value['end_time'])){
|
228
|
226
|
$item['status'] = 0;
|
229
|
|
- } else {
|
|
227
|
+ $item['use_time'] = $value['use_time'];
|
|
228
|
+ } else if(time() <= strtotime($value['end_time'])){
|
230
|
229
|
$item['status'] = 1;
|
|
230
|
+ $item['use_time'] = '';
|
|
231
|
+ } else {
|
|
232
|
+ $item['status'] = 0;
|
|
233
|
+ $item['use_time'] = '';
|
231
|
234
|
}
|
232
|
|
- $item['use_time'] = $value['use_time'];
|
|
235
|
+
|
233
|
236
|
return $item;
|
234
|
237
|
},$list);
|
235
|
238
|
return self::returnValue($list,200);
|