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

application/models/marketing/mysql/ColonelDistributorColonelApply.php

@@ -32,6 +32,11 @@ class ColonelDistributorColonelApply extends MysqlBase
         return self::get($column, $where);
     }
 
+    public static function updateRecord(array $columns, array $where)
+    {
+        return self::update($columns, $where);
+    }
+
     public static function getPages(array $where = [], $column = '*', int $page, int $pageSize, array $orderBy = ['colonel_apply_id' => 'DESC'])
     {
         if (empty($column)) {

application/services/marketing/ColonelService.php

@@ -45,6 +45,9 @@ class ColonelService
             'area' => $params['area'] ?? '',
         ];
         try {
+            if (!empty($colonelData['take_place_name'])) {
+                $colonelData['take_place_name'] = "【团长】{$colonelData['take_place_name']}";
+            }
             if (!$applyId = ColonelDistributorColonelApply::insertRecord($colonelData)) {
                 throw new MarketingException(MarketingException::COLONEL_APPLY_FAILED);
             }
@@ -124,7 +127,7 @@ class ColonelService
         try {
             ColonelDistributorColonelApply::beginTransaction();
             // 修改申请状态
-            $updateStatus = ColonelDistributorColonelApply::update(['audit_status' => $auditStatus], ['colonel_apply_id' => $applyId,'audit_status' => ColonelDistributorColonelApply::STATUS_AUDIT]);
+            $updateStatus = ColonelDistributorColonelApply::updateRecord(['audit_status' => $auditStatus], ['colonel_apply_id' => $applyId,'audit_status' => ColonelDistributorColonelApply::STATUS_AUDIT]);
             if (empty($updateStatus)) {
                 throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED);
             }

application/services/marketing/TakePlaceService.php

@@ -66,6 +66,7 @@ class TakePlaceService
 
         $data['life_account_id'] = $params['life_account_id'] ?? $lifeAccountId;
         $data['take_place_name'] = $params['name'];
+        $data['take_place_pic']  = $params['take_place_pic'] ?? '';
         $data['longitude'] = $params['longitude'];
         $data['latitude'] = $params['latitude'];
         $data['location'] = $params['location'];