|
@@ -235,11 +235,25 @@ class Api extends Core
|
|
|
$city = $county['city_id'];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ $time = time();
|
|
|
if ($this->data['card']) {
|
|
|
foreach ($this->data['card'] as $k => $v) {
|
|
|
$v['info'] = $this->data['card'][$k]['info'] = Dever::db('card/info')->find($v['card_id']);
|
|
|
|
|
|
+ if (!$v['info']) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($v['info']['end_dh_day'] && $v['info']['end_dh_day'] > 0) {
|
|
|
+ $v['eddate'] = $v['bdate'] + ($v['info']['end_dh_day'] * 86400);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isset($v['eddate']) && $v['eddate'] && $v['eddate'] > 0) {
|
|
|
+ if ($v['eddate'] <= $time) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (!$v['total_cash']) {
|
|
|
$v['total_cash'] = $v['info']['value'];
|
|
|
}
|
|
@@ -339,11 +353,21 @@ class Api extends Core
|
|
|
$this->data['card'] = array();
|
|
|
$this->data['no_card'] = array();
|
|
|
if ($card) {
|
|
|
+ $time = time();
|
|
|
foreach ($card as $k => $v) {
|
|
|
$v['info'] = Dever::db('card/info')->find($v['card_id']);
|
|
|
if (!$v['info']) {
|
|
|
continue;
|
|
|
}
|
|
|
+ if ($v['info']['end_dh_day'] && $v['info']['end_dh_day'] > 0) {
|
|
|
+ $v['eddate'] = $v['bdate'] + ($v['info']['end_dh_day'] * 86400);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isset($v['eddate']) && $v['eddate'] && $v['eddate'] > 0) {
|
|
|
+ if ($v['eddate'] <= $time) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
if (!$v['total_cash']) {
|
|
|
$v['total_cash'] = $v['info']['value'];
|
|
|
}
|