Merge branch 'master' of git.huaml.com:zhh/huahuibao

app-hd/controllers/HbController.php

@@ -67,7 +67,7 @@ class HbController extends BaseController
         //已经过期的就不再显示，并且作废，多有处作废操作，搜索关键词 cancellation_hb
         if (!empty($list)) {
             foreach ($list as $k => $v) {
-                if ($v['endTime'] < time()) {
+                if ($v['status'] == 0 && $v['endTime'] < time()) {
                     unset($list[$k]);
                     $id = $v['id'];
                     HbClass::updateById($id, ['status' => -1]);

app-mall/controllers/HbController.php

@@ -43,7 +43,7 @@ class HbController extends BaseController
         //已经过期的就不再显示，并且作废，多有处作废操作，搜索关键词 cancellation_hb
         if (!empty($list)) {
             foreach ($list as $k => $v) {
-                if ($v['endTime'] < time()) {
+                if ($v['status'] == 0 && $v['endTime'] < time()) {
                     unset($list[$k]);
                     $id = $v['id'];
                     HbClass::updateById($id, ['status' => -1]);