Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel

application/modules/Marketing/controllers/Colonel.php

@@ -34,6 +34,20 @@ class ColonelController extends Base
         return $this->success(['result' => ['applyId' => $applyId]]);
     }
 
+    /**
+     * Notes: 是否已申请
+     * User: pengfei@yidian-inc.com
+     * Date: 2021/8/25 9:56 上午
+     * @throws \App\Exception\custom\ParamException
+     */
+    public function is_applyAction()
+    {
+        $params = $this->params;
+        (new ColonelCenterValidate())->validate();
+        $isApply = ColonelService::isApply($params['user_id']);
+        return $this->success(['result' => ['is_apply' => $isApply]]);
+    }
+
     /**
      * 编辑团长分销配置
      * @throws \App\Exception\custom\MarketingException

application/services/marketing/ColonelService.php

@@ -57,6 +57,18 @@ class ColonelService
         }
     }
 
+    /**
+     * Notes: 查看用户是否已申请
+     * User: pengfei@yidian-inc.com
+     * Date: 2021/8/25 9:46 上午
+     * @param int $userId
+     * @return bool
+     */
+    public static function isApply(int $userId): bool
+    {
+        return ColonelDistributorColonelApply::existUser($userId);
+    }
+
 
     /**
      * Notes: 团长申请列表-后台管理