Merge branch 'feature/2034-brook-calcBonus' of http://16.162.42.175:8014/guanli/ngds into feature/2034-brook-calcBonus

backendApi/modules/v1/controllers/CalcController.php

@@ -17,6 +17,10 @@ use common\models\forms\PeriodForm;
 use common\models\Period;
 use Yii;
 
+/**
+ * 业务系统关于计算服务的控制器
+ */
+
 class CalcController extends BaseController
 {
     public $modelClass = FlowBonus::class;
@@ -52,6 +56,10 @@ class CalcController extends BaseController
         }
     }
 
+    /**自动计算 对应界面按钮
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
     public function actionAutoCalc()
     {
         $periodNum = \Yii::$app->request->get('periodNum');
@@ -251,6 +259,10 @@ class CalcController extends BaseController
         }
     }
 
+    /**拉取奖金
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
     public function actionPullBonus()
     {
         $periodNum = \Yii::$app->request->get('periodNum');
@@ -291,7 +303,10 @@ class CalcController extends BaseController
 
     }
 
-
+    /**操作记录列表
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
     public function actionRecordList()
     {
         $filter    = $this->filterCondition([
@@ -320,4 +335,4 @@ class CalcController extends BaseController
     }
 
 
-}
+}

common/helpers/bonus/Calc/CalcConsole.php

@@ -6,10 +6,18 @@ namespace common\helpers\bonus\Calc;
 use common\models\CalcRecord;
 use common\models\Period;
 
+/**
+ * 业务端计算服务监听脚本
+ */
 class CalcConsole extends BaseBusiness
 {
     const  CALC_DB_NAME = 'dbCalcServer';
 
+    /**监听计算服务
+     * @return array|bool
+     * @throws \yii\base\InvalidConfigException
+     * @throws \yii\db\Exception
+     */
     public static function listenCalcPeriod()
     {
         $db        = self::CALC_DB_NAME;

common/helpers/bonus/Calc/GeneratePerfOrder.php

@@ -16,7 +16,9 @@ use common\models\PerfOrder;
 use common\models\Period;
 use common\models\RemainPv;
 
-
+/**
+ * 生成业绩单相关表的数据 4张表写入1张业绩单表
+ */
 class GeneratePerfOrder extends BasePerfBusiness
 {
 
@@ -260,7 +262,6 @@ class GeneratePerfOrder extends BasePerfBusiness
 
     public function order(): bool
     {
-        echo "b";
         $_offset = 0;
         order:
         $allData = Order::find()->select('ID,SN,DEC_SN,USER_ID,ORDER_TYPE,ORDER_AMOUNT,PAY_AMOUNT,PAY_PV,PAY_TYPE,PERIOD_NUM,STATUS,IS_DELETE,P_CALC_MONTH,CREATED_AT')

common/helpers/bonus/Calc/PullCalcBonusData.php

@@ -25,6 +25,9 @@ use common\models\User;
 use common\models\UserBonus;
 use common\models\UserInfo;
 
+/**
+ * 拉取计算完成的奖金数据
+ */
 class PullCalcBonusData extends BaseBusiness
 {
     const BASE_INFO_METHODS = [

common/helpers/bonus/Calc/PushBaseDataToCalc.php

@@ -20,6 +20,9 @@ use common\models\PerfPeriod;
 use common\models\PerfStandard;
 use common\models\Period;
 
+/**
+ * 推送基础数据供计算服务使用
+ */
 class PushBaseDataToCalc extends BaseBusiness
 {
     const BASE_INFO_METHODS = [

console/controllers/CalcController.php

@@ -147,6 +147,10 @@ class CalcController extends BaseController
         return true;
     }
 
+    /**推送基础数据
+     * @param $taskKey
+     * @return bool
+     */
     public function actionPushData($taskKey): bool
     {
         $params    = Cache::getAsyncParams($taskKey);
@@ -163,6 +167,10 @@ class CalcController extends BaseController
         }
     }
 
+    /**拉取期业绩
+     * @param $taskKey
+     * @return bool
+     */
     public function actionPullPeriod($taskKey): bool
     {
         $params    = Cache::getAsyncParams($taskKey);
@@ -179,6 +187,10 @@ class CalcController extends BaseController
         }
     }
 
+    /**拉取奖金数据
+     * @param $taskKey
+     * @return bool
+     */
     public function actionPullBonus($taskKey): bool
     {
         $params    = Cache::getAsyncParams($taskKey);
@@ -195,4 +207,4 @@ class CalcController extends BaseController
         }
     }
 
-}
+}