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

application/models/marketing/mysql/PindanActivityColonel.php → application/models/marketing/mysql/PindanActivityColonelApply.php

@@ -9,7 +9,7 @@ namespace App\Models\marketing\mysql;
 
 use Api\PhpUtils\Mysql\MysqlBase;
 
-class PindanActivityColonel extends MysqlBase
+class PindanActivityColonelApply extends MysqlBase
 {
     const TABLE_NAME = 'pindan_activity_colonel';
     const CONFIG_INDEX = 'marketing';

application/services/marketing/ColonelService.php

@@ -8,7 +8,7 @@
 namespace App\Services\marketing;
 
 use App\Exception\custom\MarketingException;
-use App\Models\marketing\mysql\PindanActivityColonel;
+use App\Models\marketing\mysql\PindanActivityColonelApply;
 use Exception;
 
 class ColonelService
@@ -25,7 +25,7 @@ class ColonelService
     {
         $params['phone'] = (string)$params['phone'];
         // TODO 判断用户是否已经成为团长按照 user_id 判断
-        if (PindanActivityColonel::existPhone($params['phone'])) {
+        if (PindanActivityColonelApply::existPhone($params['phone'])) {
             throw new MarketingException(MarketingException::COLONEL_APPLY_EXIST);
         }
         $colonelData = [
@@ -42,7 +42,7 @@ class ColonelService
             'area' => $params['area'] ?? '',
         ];
         try {
-            if (!$applyId = PindanActivityColonel::insertRecord($colonelData)) {
+            if (!$applyId = PindanActivityColonelApply::insertRecord($colonelData)) {
                 throw new MarketingException(MarketingException::COLONEL_APPLY_FAILED);
             }
             return $applyId;