Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
2025-10-15 17:10:49 +08:00

View File

@@ -298,22 +298,22 @@ class RedpacketService
}
}
if ($redpacket['status'] == Redpacket::STATUS_FINISHED ||
$redpacket['status'] == Redpacket::STATUS_REFUNDED) {
return [
'code' => 0,
'msg' => '红包已结束',
'data' => null
];
}
if ($now > $redpacket['end_time']) {
return [
'code' => 0,
'msg' => '红包已结束',
'data' => null
];
}
// if ($redpacket['status'] == Redpacket::STATUS_FINISHED ||
// $redpacket['status'] == Redpacket::STATUS_REFUNDED) {
// return [
// 'code' => 0,
// 'msg' => '红包已结束',
// 'data' => null
// ];
// }
//
// if ($now > $redpacket['end_time']) {
// return [
// 'code' => 0,
// 'msg' => '红包已结束',
// 'data' => null
// ];
// }
return ['code' => 1];
}