shizhongqi преди 2 месеца
родител
ревизия
ad5fc9d0d7
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      biz-hd/birthday/classes/BirthdayGiftClass.php

+ 2 - 2
biz-hd/birthday/classes/BirthdayGiftClass.php

@@ -430,7 +430,7 @@ class BirthdayGiftClass extends BaseClass
                 // 兼容前端"待领取" 映射后端"待领取"与"领取中"两个状态
                 if ($statusFilter >= 0) {
                     if ($statusFilter == self::STATUS_PENDING_CLAIM) {
-                        // "待领取"tab,需要包含“待领取”与“领取中”两个状态
+                        // "待领取"需要包含“待领取”与“领取中”两个状态
                         if (intval($gift->status) != self::STATUS_PENDING_CLAIM && intval($gift->status) != self::STATUS_PICKING_UP) {
                             continue;
                         }
@@ -553,7 +553,7 @@ class BirthdayGiftClass extends BaseClass
                 $st = intval($gift->status);
                 if ($st == self::STATUS_PENDING_NOTIFY) {
                     $pending[$name] = ($pending[$name] ?? 0) + 1;
-                } elseif (in_array($st, [self::STATUS_PENDING_CLAIM, self::STATUS_PENDING_CLAIM, self::STATUS_COLLECTED])) {
+                } elseif (in_array($st, [self::STATUS_PENDING_CLAIM, self::STATUS_PICKING_UP, self::STATUS_COLLECTED])) {
                     $collected[$name] = ($collected[$name] ?? 0) + 1;
                 }
             }