root 3 лет назад
Родитель
Сommit
afe8fcc8bf
100 измененных файлов с 34 добавлено и 9 удалено
  1. 1 1
      .gitignore
  2. 0 0
      LICENSE.md
  3. 0 0
      README.md
  4. 0 0
      REGION_insert.sql
  5. 0 0
      Vagrantfile
  6. 0 0
      ak-upload-server/ar.upload.ming.conf
  7. 0 0
      ak-upload-server/auth.dev.lua
  8. 0 0
      ak-upload-server/auth.prod.lua
  9. 0 0
      ak-upload-server/server.dev.py
  10. 0 0
      ak-upload-server/server.prod.py
  11. 0 0
      ak-upload-server/token.php
  12. 0 0
      ak-upload-server/upload.py
  13. 0 0
      ak-upload-server/upload_img_filter.conf
  14. 0 0
      ak-upload-server/upload_img_filter.dev.conf
  15. 0 0
      ak-upload-server/upload_img_filter.prod.conf
  16. 0 0
      ak-upload-server/venv/bin/activate
  17. 0 0
      ak-upload-server/venv/bin/activate.csh
  18. 0 0
      ak-upload-server/venv/bin/activate.fish
  19. 0 0
      ak-upload-server/venv/bin/easy_install
  20. 0 0
      ak-upload-server/venv/bin/easy_install-3.6
  21. 0 0
      ak-upload-server/venv/bin/pip
  22. 0 0
      ak-upload-server/venv/bin/pip3
  23. 0 0
      ak-upload-server/venv/bin/pip3.6
  24. 0 0
      ak-upload-server/venv/bin/python
  25. 0 0
      ak-upload-server/venv/bin/python3
  26. 0 0
      ak-upload-server/venv/bin/python3.6
  27. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth
  28. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg
  29. 0 0
      ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth
  30. 0 0
      ak-upload-server/venv/pyvenv.cfg
  31. 0 0
      backend/assets/AppAsset.php
  32. 0 0
      backend/codeception.yml
  33. 0 0
      backend/config/.gitignore
  34. 0 0
      backend/config/bootstrap.php
  35. 0 0
      backend/config/main-local.php
  36. 0 0
      backend/config/main.php
  37. 0 0
      backend/config/params.php
  38. 0 0
      backend/config/test.php
  39. 0 0
      backend/controllers/SiteController.php
  40. 0 0
      backend/controllers/TestController.php
  41. 0 0
      backend/models/.gitkeep
  42. 0 0
      backend/runtime/.gitignore
  43. 0 0
      backend/tests/_bootstrap.php
  44. 0 0
      backend/tests/_data/.gitignore
  45. 0 0
      backend/tests/_data/login_data.php
  46. 0 0
      backend/tests/_output/.gitignore
  47. 0 0
      backend/tests/_support/.gitignore
  48. 0 0
      backend/tests/_support/FunctionalTester.php
  49. 0 0
      backend/tests/_support/UnitTester.php
  50. 0 0
      backend/tests/functional.suite.yml
  51. 0 0
      backend/tests/functional/LoginCest.php
  52. 0 0
      backend/tests/functional/_bootstrap.php
  53. 0 0
      backend/tests/unit.suite.yml
  54. 0 0
      backend/tests/unit/_bootstrap.php
  55. 0 0
      backend/views/layouts/main.php
  56. 0 0
      backend/views/site/addDecTest.php
  57. 0 0
      backend/views/site/error.php
  58. 0 0
      backend/views/site/index.php
  59. 0 0
      backend/views/site/login.php
  60. 0 0
      backend/web/.gitignore
  61. 0 0
      backend/web/assets/.gitignore
  62. 0 0
      backend/web/css/site.css
  63. 0 0
      backend/web/favicon.ico
  64. 0 0
      backend/web/index.php
  65. 0 0
      backend/web/robots.txt
  66. 0 0
      backend/web/test.php
  67. 0 0
      backendApi/config/bootstrap.php
  68. 0 0
      backendApi/config/main.php
  69. 7 5
      backendApi/config/menu.php
  70. 0 0
      backendApi/config/params.php
  71. 1 0
      backendApi/config/urlManagerRules.php
  72. 0 0
      backendApi/modules/v1/Module.php
  73. 0 0
      backendApi/modules/v1/components/UserAuth.php
  74. 0 0
      backendApi/modules/v1/controllers/AdController.php
  75. 0 0
      backendApi/modules/v1/controllers/AdminController.php
  76. 0 0
      backendApi/modules/v1/controllers/ArticleController.php
  77. 0 0
      backendApi/modules/v1/controllers/AtlasController.php
  78. 0 0
      backendApi/modules/v1/controllers/BaseController.php
  79. 0 0
      backendApi/modules/v1/controllers/BonusController.php
  80. 23 0
      backendApi/modules/v1/controllers/ConfigController.php
  81. 0 0
      backendApi/modules/v1/controllers/DashboardController.php
  82. 0 0
      backendApi/modules/v1/controllers/FileController.php
  83. 0 0
      backendApi/modules/v1/controllers/FinanceController.php
  84. 0 0
      backendApi/modules/v1/controllers/LogController.php
  85. 0 0
      backendApi/modules/v1/controllers/MessageController.php
  86. 0 0
      backendApi/modules/v1/controllers/OauthController.php
  87. 0 0
      backendApi/modules/v1/controllers/ReconsumeController.php
  88. 0 0
      backendApi/modules/v1/controllers/ReportController.php
  89. 0 0
      backendApi/modules/v1/controllers/ShopController.php
  90. 0 0
      backendApi/modules/v1/controllers/SiteController.php
  91. 2 3
      backendApi/modules/v1/controllers/UserController.php
  92. 0 0
      backendApi/modules/v1/models/Admin.php
  93. 0 0
      backendApi/modules/v1/models/AdminForm.php
  94. 0 0
      backendApi/modules/v1/models/AdminRole.php
  95. 0 0
      backendApi/modules/v1/models/AdminRoleForm.php
  96. 0 0
      backendApi/modules/v1/models/AdminToken.php
  97. 0 0
      backendApi/modules/v1/models/LoginForm.php
  98. 0 0
      backendApi/modules/v1/models/User.php
  99. 0 0
      backendApi/modules/v1/models/exportForms/AtlasExportForm.php
  100. 0 0
      backendApi/modules/v1/models/exportForms/BaseExportForm.php

+ 1 - 1
.gitignore

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

+ 0 - 0
LICENSE.md



+ 0 - 0
REGION_insert.sql


+ 0 - 0
Vagrantfile


+ 0 - 0
ak-upload-server/ar.upload.ming.conf


+ 0 - 0
ak-upload-server/auth.dev.lua


+ 0 - 0
ak-upload-server/auth.prod.lua


+ 0 - 0
ak-upload-server/server.dev.py


+ 0 - 0
ak-upload-server/server.prod.py


+ 0 - 0
ak-upload-server/token.php


+ 0 - 0
ak-upload-server/upload.py


+ 0 - 0
ak-upload-server/upload_img_filter.conf


+ 0 - 0
ak-upload-server/upload_img_filter.dev.conf


+ 0 - 0
ak-upload-server/upload_img_filter.prod.conf


+ 0 - 0
ak-upload-server/venv/bin/activate


+ 0 - 0
ak-upload-server/venv/bin/activate.csh


+ 0 - 0
ak-upload-server/venv/bin/activate.fish


+ 0 - 0
ak-upload-server/venv/bin/easy_install


+ 0 - 0
ak-upload-server/venv/bin/easy_install-3.6


+ 0 - 0
ak-upload-server/venv/bin/pip


+ 0 - 0
ak-upload-server/venv/bin/pip3


+ 0 - 0
ak-upload-server/venv/bin/pip3.6


+ 0 - 0
ak-upload-server/venv/bin/python


+ 0 - 0
ak-upload-server/venv/bin/python3


+ 0 - 0
ak-upload-server/venv/bin/python3.6


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/easy-install.pth


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools-28.8.0-py3.6.egg


+ 0 - 0
ak-upload-server/venv/lib/python3.6/site-packages/setuptools.pth


+ 0 - 0
ak-upload-server/venv/pyvenv.cfg


+ 0 - 0
backend/assets/AppAsset.php


+ 0 - 0
backend/codeception.yml


+ 0 - 0
backend/config/.gitignore


+ 0 - 0
backend/config/bootstrap.php


+ 0 - 0
backend/config/main-local.php


+ 0 - 0
backend/config/main.php


+ 0 - 0
backend/config/params.php


+ 0 - 0
backend/config/test.php


+ 0 - 0
backend/controllers/SiteController.php


+ 0 - 0
backend/controllers/TestController.php


+ 0 - 0
backend/models/.gitkeep


+ 0 - 0
backend/runtime/.gitignore


+ 0 - 0
backend/tests/_bootstrap.php


+ 0 - 0
backend/tests/_data/.gitignore


+ 0 - 0
backend/tests/_data/login_data.php


+ 0 - 0
backend/tests/_output/.gitignore


+ 0 - 0
backend/tests/_support/.gitignore


+ 0 - 0
backend/tests/_support/FunctionalTester.php


+ 0 - 0
backend/tests/_support/UnitTester.php


+ 0 - 0
backend/tests/functional.suite.yml


+ 0 - 0
backend/tests/functional/LoginCest.php


+ 0 - 0
backend/tests/functional/_bootstrap.php


+ 0 - 0
backend/tests/unit.suite.yml


+ 0 - 0
backend/tests/unit/_bootstrap.php


+ 0 - 0
backend/views/layouts/main.php


+ 0 - 0
backend/views/site/addDecTest.php


+ 0 - 0
backend/views/site/error.php


+ 0 - 0
backend/views/site/index.php


+ 0 - 0
backend/views/site/login.php


+ 0 - 0
backend/web/.gitignore


+ 0 - 0
backend/web/assets/.gitignore


+ 0 - 0
backend/web/css/site.css


+ 0 - 0
backend/web/favicon.ico


+ 0 - 0
backend/web/index.php


+ 0 - 0
backend/web/robots.txt


+ 0 - 0
backend/web/test.php


+ 0 - 0
backendApi/config/bootstrap.php


+ 0 - 0
backendApi/config/main.php


+ 7 - 5
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'=>[

+ 0 - 0
backendApi/config/params.php


+ 1 - 0
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',

+ 0 - 0
backendApi/modules/v1/Module.php


+ 0 - 0
backendApi/modules/v1/components/UserAuth.php


+ 0 - 0
backendApi/modules/v1/controllers/AdController.php


+ 0 - 0
backendApi/modules/v1/controllers/AdminController.php


+ 0 - 0
backendApi/modules/v1/controllers/ArticleController.php


+ 0 - 0
backendApi/modules/v1/controllers/AtlasController.php


+ 0 - 0
backendApi/modules/v1/controllers/BaseController.php


+ 0 - 0
backendApi/modules/v1/controllers/BonusController.php


+ 23 - 0
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

+ 0 - 0
backendApi/modules/v1/controllers/DashboardController.php


+ 0 - 0
backendApi/modules/v1/controllers/FileController.php


+ 0 - 0
backendApi/modules/v1/controllers/FinanceController.php


+ 0 - 0
backendApi/modules/v1/controllers/LogController.php


+ 0 - 0
backendApi/modules/v1/controllers/MessageController.php


+ 0 - 0
backendApi/modules/v1/controllers/OauthController.php


+ 0 - 0
backendApi/modules/v1/controllers/ReconsumeController.php


+ 0 - 0
backendApi/modules/v1/controllers/ReportController.php


+ 0 - 0
backendApi/modules/v1/controllers/ShopController.php


+ 0 - 0
backendApi/modules/v1/controllers/SiteController.php


+ 2 - 3
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);//会员编号不存在

+ 0 - 0
backendApi/modules/v1/models/Admin.php


+ 0 - 0
backendApi/modules/v1/models/AdminForm.php


+ 0 - 0
backendApi/modules/v1/models/AdminRole.php


+ 0 - 0
backendApi/modules/v1/models/AdminRoleForm.php


+ 0 - 0
backendApi/modules/v1/models/AdminToken.php


+ 0 - 0
backendApi/modules/v1/models/LoginForm.php


+ 0 - 0
backendApi/modules/v1/models/User.php


+ 0 - 0
backendApi/modules/v1/models/exportForms/AtlasExportForm.php


+ 0 - 0
backendApi/modules/v1/models/exportForms/BaseExportForm.php


Некоторые файлы не были показаны из-за большого количества измененных файлов