Merge branch 'colonel' into develop

application/modules/Job/controllers/Colonelorder.php

@@ -36,10 +36,7 @@ class ColonelorderController extends Job
     public function init()
     {
         parent::init();
-        $timeRange = PindanActivityColonelConfigService::getSettlementTimeRange();
-        $this->settlementDate = $timeRange['date'];
-        $this->startTime = $timeRange['start_time'];
-        $this->endTime = $timeRange['end_time'];
+        $this->loadTimeConfig();
         $this->colonelConfigList = $this->getColonelConfig($this->settlementDate);
     }
 
@@ -267,6 +264,28 @@ class ColonelorderController extends Job
         return (int)ColonelDistributorPayInfo::save($data);
     }
 
+    /**
+     * Notes: 加载配置
+     * User: pengfei@yidian-inc.com
+     * Date: 2021/9/8 7:43 下午
+     */
+    private function loadTimeConfig()
+    {
+        // 如果传入时间-使用指定时间
+        $params = $this->getRequest()->getParams();
+        if (empty($params['date']) || strtotime($params['date'])) {
+            $timeRange = PindanActivityColonelConfigService::getSettlementTimeRange();
+            $this->settlementDate = $timeRange['date'];
+            $this->startTime = $timeRange['start_time'];
+            $this->endTime = $timeRange['end_time'];
+        } else {
+            $hour = PindanActivityColonelConfigService::ACTIVITY_DEFAULT_HOUR;
+            $this->settlementDate = $params['date'];
+            $this->startTime = "{$params['date']} $hour:00:00";
+            $this->endTime = strtotime($this->startTime . ' +1 day');
+        }
+    }
+
     /**
      * Notes: 记录 info 日志
      * User: pengfei@yidian-inc.com

application/services/marketing/ColonelService.php

@@ -49,11 +49,11 @@ class ColonelService
                 $colonelData['take_place_name'] = "【团长】{$colonelData['take_place_name']}";
             }
             if (!$applyId = ColonelDistributorColonelApply::insertRecord($colonelData)) {
-                throw new MarketingException(MarketingException::COLONEL_APPLY_FAILED);
+                throw new Exception(MarketingException::COLONEL_APPLY_FAILED);
             }
             return $applyId;
         } catch (Exception $e) {
-            throw new MarketingException(MarketingException::COLONEL_APPLY_FAILED);
+            throw new MarketingException($e->getMessage());
         }
     }
 
@@ -171,21 +171,21 @@ class ColonelService
                 ['colonel_apply_id' => $applyId, 'audit_status[!]' => ColonelDistributorColonelApply::STATUS_PASS]
             );
             if (empty($updateStatus)) {
-                throw new MarketingException(MarketingException::COLONEL_AUDIT_STATUS_FAILED);
+                throw new Exception(MarketingException::COLONEL_AUDIT_STATUS_FAILED);
             }
             // 审核成功
             if ($auditStatus == ColonelDistributorColonelApply::STATUS_PASS) {
                 if (!self::handleAuditSuccess((array)$applyInfo)) {
-                    throw new MarketingException(MarketingException::COLONEL_ADD_FAILED);
+                    throw new Exception(MarketingException::COLONEL_ADD_FAILED);
                 }
             }
             if (!ColonelDistributorColonelApply::commit()) {
-                throw new MarketingException(MarketingException::COMMIT_ERROR);
+                throw new Exception(MarketingException::COMMIT_ERROR);
             }
             return true;
-        } catch (MarketingException $e) {
+        } catch (Exception $e) {
             ColonelDistributorColonelApply::rollback();
-            throw new MarketingException($e->getCode());
+            throw new MarketingException($e->getMessage());
         }
     }
 
@@ -232,19 +232,19 @@ class ColonelService
             ColonelDistributorColonel::beginTransaction();
             // 添加自提点
             if (!$takePlaceId = TakePlaceService::add($params)) {
-                throw new MarketingException(MarketingException::COLONEL_TAKE_PLACE_FAILED);
+                throw new Exception(MarketingException::COLONEL_TAKE_PLACE_FAILED);
             }
             // 修改自提点id
             if (!ColonelDistributorColonel::updateRecord(['take_place_id' => $takePlaceId], $where)) {
-                throw new MarketingException(MarketingException::COLONEL_TAKE_PLACE_EDIT_FAILED);
+                throw new Exception(MarketingException::COLONEL_TAKE_PLACE_EDIT_FAILED);
             }
             if (!ColonelDistributorColonel::commit()) {
-                throw new MarketingException(MarketingException::COMMIT_ERROR);
+                throw new Exception(MarketingException::COMMIT_ERROR);
             }
             return (int)$takePlaceId;
-        } catch (MarketingException $e) {
+        } catch (Exception $e) {
             ColonelDistributorColonel::rollback();
-            throw new MarketingException($e->getCode());
+            throw new MarketingException($e->getMessage());
         }
     }