feat: NG-15: 新会员注册时增加国家与语言选项.

common/config/params-swoole.php

@@ -30,7 +30,7 @@ return [
         'max_time_diff'    => 0,              //请求服务端允许的最大时间差
         'debug'            => true,             //是否开启调试模式
         'with_timer'       => true,             //是否使用定时器
-        'timer_interval'   => 5000,             //定时器时间间隔
+        'timer_interval'   => 60000,             //定时器时间间隔
         'log_size'         => 204800000, 		//运行时日志 单个文件大小
         'log_dir'          => dirname(__DIR__).'/runtime/logs',			 //运行时日志 存放目录
     ],

frontendApi/modules/v1/controllers/BonusController.php

@@ -224,7 +224,10 @@ class BonusController extends BaseController {
      */
     public function actionWalletFlow(){
         $walletType = \Yii::$app->request->get('walletType');
-        if(!in_array($walletType,['bonus', 'cash', 'exchange'/**, 'tourism_points', 'garage_points', 'villa_points'*/])) return static::notice('walletType error',400);
+        if(!in_array($walletType,['bonus', 'cash', 'exchange', 'prp'/**, 'tourism_points', 'garage_points', 'villa_points'*/])) {
+            return static::notice('walletType error',400);
+        }
+
         $dealType = \Yii::$app->request->get('dealType');
         $createAt = \Yii::$app->request->get('createAt');
         $remark = \Yii::$app->request->get('remark');
@@ -310,6 +313,13 @@ class BonusController extends BaseController {
 //                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
 //                'orderBy' => 'CREATED_AT DESC',
 //            ]);
+        }else if ($walletType == 'prp') {
+            $dealLists = FlowExchangePoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID', [':USER_ID' => \Yii::$app->user->id])->asArray()->all();
+            $data = FlowExchangePoints::lists($condition, $params, [
+                'useSlaves' => true,
+                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
+                'orderBy' => 'CREATED_AT DESC',
+            ]);
         } else {
             return static::notice('walletType error',400);
         }