Merge branch 'colonel' into test

application/services/marketing/ColonelService.php

@@ -153,14 +153,15 @@ class ColonelService
         }
         // 审核状态数据检测
         $applyInfo = ColonelDistributorColonelApply::getRecord(['colonel_apply_id' => $applyId]);
-        if (empty($applyInfo) || $applyInfo['audit_status'] != ColonelDistributorColonelApply::STATUS_AUDIT) {
+        if (empty($applyInfo) || $applyInfo['audit_status'] == ColonelDistributorColonelApply::STATUS_PASS) {
             throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_USE);
         }
         try {
             ColonelDistributorColonelApply::beginTransaction();
             // 修改申请状态
             $updateStatus = ColonelDistributorColonelApply::updateRecord(['audit_status' => $auditStatus],
-                ['colonel_apply_id' => $applyId, 'audit_status' => ColonelDistributorColonelApply::STATUS_AUDIT]);
+                ['colonel_apply_id' => $applyId, 'audit_status' => ColonelDistributorColonelApply::STATUS_AUDIT]
+            );
             if (empty($updateStatus)) {
                 throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED);
             }