合并mest

.gitignore

@@ -20,4 +20,4 @@ Desktop.ini
 #App
 common/config/config.php
 
-frontendApi/web/pdfs/
+frontendApi/web/pdfs/

backendApi/config/menu.php

@@ -26,7 +26,7 @@ return [
         ]
     ],
     'shop'=>[
-        'name'=>'Products Management',//商城管理
+        'name'=>'Shopping Mall',//商城管理
         'class' => '',
         'icon'=>'el-icon-goods',
         'controller'=>'shop',
@@ -42,14 +42,16 @@ return [
             // 新添加的商品操作 ---stop
             ['name'=>'商品列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'goods-list-export', 'routePath'=>'shop/goods-list-export', 'show'=>0,],
             ['name'=>' Kitting products manage', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'package', 'routePath'=>'shop/package', 'show'=>1,],//套餐管理
-            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
-            ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
+
+            // ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
+            // ['name'=>'报单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list-export', 'routePath'=>'shop/dec-order-list-export', 'show'=>0,],
             ['name'=>'order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
             ['name'=>'订单列表导出', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list-export', 'routePath'=>'shop/order-list-export', 'show'=>0,],
             ['name'=>'订单发货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-delivery', 'routePath'=>'shop/order-delivery', 'show'=>0,],
             ['name'=>'External mall order list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-shop-list', 'routePath'=>'shop/order-shop-list', 'show'=>1,],//外部商城订单列表
-            ['name'=>'External mall entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],//外部商城报单列表
-            ['name'=>'List of qualified orders of external mall', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],//外部商城达标订单列表
+            // ['name'=>'External mall entry list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-dec-list', 'routePath'=>'shop/order-dec-list', 'show'=>1,],//外部商城报单列表
+            // ['name'=>'List of qualified orders of external mall', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-standard-list', 'routePath'=>'shop/order-standard-list', 'show'=>1,],//外部商城达标订单列表
+
         ]
     ],
     'user'=>[

backendApi/config/urlManagerRules.php

@@ -277,6 +277,7 @@ return [
             'POST emp-level-delete' => 'emp-level-delete',
             'POST bonus-dec-level' => 'bonus-dec-level',
             'POST bonus-emp-level' => 'bonus-emp-level',
+            'POST bonus-star-level' => 'bonus-star-level',
             'GET clear-data' => 'clear-data',
             'GET clear-cache' => 'clear-cache',
             'GET clear-table-cache' => 'clear-table-cache',

backendApi/modules/v1/controllers/ConfigController.php

@@ -29,6 +29,7 @@ use common\models\FlowBonus;
 use common\models\forms\OcrApiForm;
 use common\models\forms\SmsApiForm;
 use common\models\forms\SmsTemplateForm;
+use common\models\StarCrownLevelForm;
 use common\models\forms\WithdrawLevelForm;
 use common\models\OcrApi;
 use common\models\PerfCompany;
@@ -40,6 +41,7 @@ use common\models\DeclarationLevel;
 use common\models\EmployLevel;
 use common\models\SmsApi;
 use common\models\SmsTemplate;
+use common\models\StarCrownLevel;
 use common\models\UserBonus;
 use common\models\UserClose;
 use common\models\UserInfo;
@@ -116,10 +118,13 @@ class ConfigController extends BaseController {
         $decLevel = DeclarationLevel::find()->orderBy('SORT ASC')->asArray()->all();
         // 获取会员聘级相关参数
         $empLevel = EmployLevel::getAllDataWithNumIndex();
+        // 获取会员星级相关参数
+        $starLevel = StarCrownLevel::getAllDataWithNumIndex();
         $result = [
             'config' => $configs,
             'decLevel' => $decLevel,
             'empLevel' => $empLevel,
+            'starLevel' => $starLevel,
         ];
         return static::notice($result);
     }
@@ -178,6 +183,24 @@ class ConfigController extends BaseController {
         }
     }
 
+    /**
+     * 修改会员星级相关的奖金配置
+     * @return mixed
+     * @throws \yii\db\Exception
+     * @throws \yii\web\HttpException
+     */
+    public function actionBonusStarLevel() {
+        $form = new StarCrownLevelForm();
+        if (Yii::$app->request->post() && $form->load(Yii::$app->request->post(), '')) {
+            if ($form->updateBonus()) {
+                StarCrownLevel::updateToCache();
+                return static::notice('更新星级奖金配置成功');
+            } else {
+                return static::notice(Form::formatErrorsForApi($form->getErrors()), 422);
+            }
+        }
+    }
+
     /**
      * 更新封期参数
      * @return mixed

backendApi/modules/v1/controllers/UserController.php

@@ -885,9 +885,8 @@ class UserController extends BaseController
             $userInfo['CASH'] = Cash::getAvailableBalance($userInfo['ID']);
             $userInfo['RECONSUME_POINTS'] = Balance::getBalanceReconsumePoints($userInfo['ID']);
             $userInfo['EXCHANGE_POINTS'] = Balance::getBalanceExchangePoints($userInfo['ID']);
-            $userInfo['TRAVEL_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'travel_points');
-            $userInfo['CAR_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'car_points');
-            $userInfo['HOUSE_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'house_points');
+            $userInfo['TOURISM_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'tourism_points');
+            $userInfo['GARAGE_POINTS'] = Balance::getAccountBalance($userInfo['ID'], 'garage_points');
             return static::notice($userInfo);
         }else{
             return static::notice('Member number does not exist', 400);//会员编号不存在