Merge branch 'colonel' into develop

46928855 · pengfei · a7ea313b · dfa6acba · 46928855
Commit 46928855 authored Aug 26, 2021 by pengfei
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

ColonelService.php application/services/marketing/ColonelService.php +3 -3

No files found.
--- a/application/services/marketing/ColonelService.php
+++ b/application/services/marketing/ColonelService.php
@@ -66,10 +66,10 @@ class ColonelService
     */
    public static function isApply(int $userId): array
    {
-        $applyInfo = ColonelDistributorColonelApply::getRecord(['user_id' => $userId],['colonel_apply_id','audit_status']);
+        $applyInfo = ColonelDistributorColonelApply::getRecord(['user_id' => $userId], ['colonel_apply_id','audit_status']);
        return [
-            'is_apply' => !empty($applyInfo) ? 1 : 0,
+            // -1.未申请  0.未审核  1.审核通过  2.审核未通过
-            'audit_status' => $applyInfo['audit_status']
+            'apply_status' => !empty($applyInfo['audit_status']) ? intval($applyInfo['audit_status']) : -1
        ];
    }