Merge branch 'master' into feature/york-1365-i18n-inpro-0630

backendApi/web/index.php

@@ -2,7 +2,7 @@
 ini_set('display_errors', 'On');
 error_reporting(E_ALL);
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_ENV') or define('YII_ENV', 'prod');
 
 require __DIR__ . '/../../vendor/autoload.php';
 require __DIR__ . '/../../vendor/yiisoft/yii2/Yii.php';

common/config/main.php

@@ -64,7 +64,7 @@ return [
             'environment'   => YII_ENV,
             'testPublicKey' => 'pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55',
             'testSecretKey' => 'sk_test_5ece72377432376f5cf6bb5c468395a650220309',
-            'livePublicKey' => 'sk_live_b93c6bbee2cc0e9c594547bf4779ec9852b9d055',
+            'livePublicKey' => 'pk_live_fae524f9d073d877beeb661fd825a37a9bc91f0a',
             'liveSecretKey' => 'sk_live_b93c6bbee2cc0e9c594547bf4779ec9852b9d055',
         ],
         // 配置SQL语句输出

common/helpers/bonus/BonusCalc.php

@@ -58,6 +58,7 @@ use yii\base\BaseObject;
 use yii\base\Exception;
 use yii\base\StaticInstanceTrait;
 use yii\helpers\Json;
+use yii\db\Query;
 
 class BonusCalc extends BaseObject {
     use StaticInstanceTrait;
@@ -346,7 +347,7 @@ class BonusCalc extends BaseObject {
             echo('结算全部完成，共耗时：' . round($t35 - $t34, 3) . ',内存使用：' . (round(memory_get_usage() / 1024 / 1024, 3)) . 'MB' . PHP_EOL . PHP_EOL);
         } catch (\Exception $e) {
             $this->errorCalcTask();
-            $this->addError('calc', $e->getMessage());
+            $this->addError('calc', $e->getFile() . '  ' . $e->getLine() . '  ' . $e->getMessage());
             return false;
         }
         return true;
@@ -1699,7 +1700,7 @@ class BonusCalc extends BaseObject {
             $starDirectorPoint = $this->_empLevelConfig[$userStarDirectorObj[$userId]['LEVEL_ID']]['TOURISM_PERCENT'] ?? 0;
             $startCrownPoint = $this->_starCrownLevelConfig[$userStarCrownObj[$userId]['LAST_STAR_LV']]['TOURISM_PERCENT'] ?? 0;
             // 奖金比例：
-            $bonusPoint = min($starDirectorPoint, $startCrownPoint);
+            $bonusPoint = max($starDirectorPoint, $startCrownPoint);
             // 计算奖金
             $amount = Tool::formatPrice(($monthTotalPV * $mate * $bonusPoint) / 100);
             if ($amount <= 0) {
@@ -1775,18 +1776,21 @@ class BonusCalc extends BaseObject {
             ->all();
         $userStarDirectorObj = array_column($userStarDirector, NULL, 'USER_ID');
 
-        // 基于团队奖/绩效奖结果计算会员的StarCrown
-        $userStarCrown = CalcBonusQY::find()
+        // 基于团队奖/绩效奖结果计算会员的StarCrown.StarCrown基于周期计算,一个月会产生多次,取月周期中的最高星级
+        $subQuery = CalcBonusQY::find()
             ->yearMonth($this->_calcYearMonth)
-            ->where('CALC_MONTH = :CALC_MONTH', [':CALC_MONTH' => $this->_calcYearMonth])
-            ->select('USER_ID,LAST_DEC_LV,LAST_EMP_LV,LAST_STAR_LV,LAST_STATUS')
-            ->groupBy('USER_ID')
-            ->asArray()
-            ->all();
-        $userStarCrownObj = array_column($userStarCrown, NULL, 'USER_ID');
-
+            ->where('CALC_MONTH = :CALC_MONTH AND LAST_STAR_LV <> :NO_STAR_LV', [':CALC_MONTH' => $this->_calcYearMonth, ':NO_STAR_LV' => StarCrownLevel::NO_LEVEL_ID])
+            ->select('USER_ID,LAST_DEC_LV,LAST_EMP_LV,LAST_STAR_LV,LAST_STATUS,LEVEL_NAME,SORT')
+            ->joinWith(['starCrown' => function($query) {
+                $query->select(['LEVEL_NAME', 'SORT']);
+            }])
+            ->having(1)
+            ->orderBy('USER_ID ASC, SORT DESC');
+        $userStarCrownObj = (new Query())->from(['u' => $subQuery])->select('USER_ID,LAST_DEC_LV,LAST_EMP_LV,LAST_STAR_LV,LAST_STATUS,LEVEL_NAME,SORT')->groupBy('USER_ID')->indexBy('USER_ID')->all();
+        
         // 合并用户ID,去重
         $bonusUsers = array_unique(array_merge(array_keys($userStarDirectorObj), array_keys($userStarCrownObj)));
+        sort($bonusUsers);
 
         $insertBonusData = [];
         foreach($bonusUsers as $userId) {
@@ -1794,7 +1798,7 @@ class BonusCalc extends BaseObject {
             $starDirectorPoint = !isset($userStarDirectorObj[$userId]['LEVEL_ID']) ? 0 : ($this->_empLevelConfig[$userStarDirectorObj[$userId]['LEVEL_ID']]['GARAGE_PERCENT'] ?? 0);
             $startCrownPoint = !isset($userStarCrownObj[$userId]['LAST_STAR_LV']) ? 0: ($this->_starCrownLevelConfig[$userStarCrownObj[$userId]['LAST_STAR_LV']]['GARAGE_PERCENT'] ?? 0);
             // 奖金比例：
-            $bonusPoint = min($starDirectorPoint, $startCrownPoint);
+            $bonusPoint = max($starDirectorPoint, $startCrownPoint);
             // 计算奖金
             $amount = Tool::formatPrice(($monthTotalPV * $mate * $bonusPoint) / 100);
             if ($amount <= 0) {
@@ -1804,7 +1808,7 @@ class BonusCalc extends BaseObject {
             $amount = ($amount > $capBonus) ? $capBonus : $amount;
 
             // 会员级别+聘级都达到要求才会发放奖金
-            if (in_array($userStarDirectorObj[$userId]['LAST_DEC_LV'], $minDecLevel)) {
+            if (isset($userStarDirectorObj[$userId]) && in_array($userStarDirectorObj[$userId]['LAST_DEC_LV'], $minDecLevel)) {
                 // 放入缓存
                 CalcCache::garageBonus($userId, $this->_periodNum, $amount);
                 // 加入月奖的会员

common/helpers/bonus/BonusSend.php

@@ -432,7 +432,7 @@ class BonusSend extends BaseObject {
     public function updateEmpLevel(int $offset = 0) {
         if ($this->_isCalcMonth) {
             $empLv = EmployLevel::getIdConvertLevelSortCache();
-            $allData = CalcBonusBS::findUseDbCalc()
+            $allData = CalcBonus::findUseDbCalc()
             ->yearMonth($this->_calcYearMonth)
             ->where(
                 'CALC_MONTH=:CALC_MONTH AND PERIOD_NUM=:PERIOD_NUM', 
@@ -442,7 +442,6 @@ class BonusSend extends BaseObject {
                 ]
             )
             ->orderBy('CREATED_AT DESC')
-            ->groupBy('USER_ID')
             ->offset($offset)
             ->limit($this->_limit)
             ->all();
@@ -453,15 +452,15 @@ class BonusSend extends BaseObject {
                 try {
                     foreach ($allData as $data) {
                         //@todo 用户级别不变则不更新
-                        if( $data['LEVEL_ID'] === $defaultEmpLv ) continue;
-                        $nowBsEmpLv = $data['LEVEL_ID']; // 当前蓝星奖计算(即管理奖) 的等级
+                        if( $data['LAST_EMP_LV'] === $defaultEmpLv ) continue;
+                        $nowBsEmpLv = $data['LAST_EMP_LV']; // 当前蓝星奖计算(即管理奖) 的等级
                         $user = CalcCache::getUserInfo($data['USER_ID'], $this->_periodNum);
                         $userEmpLv = $user['EMP_LV']; // 用户的历史最高聘级
                         $userEmpLvSort = $empLv[$userEmpLv]; // 历史最高聘级的 级别值
                         $nowBsEmpLvSort = $empLv[$nowBsEmpLv]; // 当前蓝星计算的聘级 级别值
                         if ($nowBsEmpLvSort > $userEmpLvSort) {
                             // 如果当前期的级别值大于历史最高级别,则更新用户表里的最高聘级
-                            User::updateAll(['EMP_LV' => $data['LEVEL_ID']], 'ID=:USER_ID', [':USER_ID' => $data['USER_ID']]);
+                            User::updateAll(['EMP_LV' => $nowBsEmpLv], 'ID=:USER_ID', [':USER_ID' => $data['USER_ID']]);
                             User::deleteBaseInfoFromRedis($data['USER_ID']);
                             unset($data);
                         } else {

common/models/CalcBonusQY.php

@@ -70,4 +70,9 @@ class CalcBonusQY extends \common\components\ActiveRecord
             'MANAGE_TAX' => '管理费',
         ];
     }
+
+    public function getStarCrown()
+    {
+        return $this->hasOne(StarCrownLevel::class, ['ID' => 'LAST_STAR_LV']);
+    }
 }

common/models/ShopGoods.php

@@ -55,7 +55,7 @@ class ShopGoods extends \common\components\ActiveRecord
         ],
         5 => [
             'id' => 5,
-            'name' => 'Car/Villa Bonus',
+            'name' => 'Car/Villa Fund',
             'label' => 'garage_points',
         ],
         7 => [
@@ -112,7 +112,7 @@ class ShopGoods extends \common\components\ActiveRecord
 //        ],
         [
             'id' => 5,
-            'name' => 'Car/Villa bonus products',
+            'name' => 'Car/Villa Fund Products',
             'sell_type' => [
                 self::SALE_TYPE[5]
             ]
@@ -226,7 +226,7 @@ class ShopGoods extends \common\components\ActiveRecord
 //                'name'=>'Travel Bonus'
 //            ],
             'garage_points' => [
-                'name' => 'Car/Villa Bonus'
+                'name' => 'Car/Villa Fund'
             ],
             'pay_stack' => [
                 'name' => 'PayStack'

common/models/forms/ApproachOrderForm.php

@@ -287,12 +287,12 @@ class ApproachOrderForm extends Model
         LoggerTool::info([$this->note['reference'], $this->note]);
         $payload = PayStack::transactionVerify($this->note['reference']);
         LoggerTool::info($payload);
-//        if ($payload['status'] !== true) {
-//            throw new Exception(Form::formatErrorsForApi($payload['message']));
-//        }
-//        if ($payload['data']['amount'] != $this->_model->PAY_AMOUNT * 100) {
-//            throw new Exception(Form::formatErrorsForApi('支付金额与订单金额不符'));
-//        }
+        if ($payload['status'] !== true) {
+            throw new Exception(Form::formatErrorsForApi($payload['message']));
+        }
+        if ($payload['data']['amount'] != $this->_model->PAY_AMOUNT * 100) {
+            throw new Exception(Form::formatErrorsForApi('支付金额与订单金额不符'));
+        }
 
         $db = \Yii::$app->db;
         $transaction = $db->beginTransaction();

frontendApi/config/menu.php

@@ -33,6 +33,7 @@ return [
 
             ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
             ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
+//            ['name'=>'申请退货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-backing-out', 'routePath'=>'shop/order-backing-out', 'show'=>1,],//申请退货
         ]
     ],
     'user'=>[

frontendApi/config/urlManagerRules.php

@@ -78,6 +78,7 @@ return [
             'POST sure-approach-order' => 'sure-approach-order',
             'POST delete-approach-order' => 'delete-approach-order',
             'POST verify-approach-order' => 'verify-approach-order',
+            'GET order-backing-out' => 'order-backing-out',
         ],
     ],
     [

frontendApi/modules/v1/controllers/ShopController.php

@@ -382,11 +382,11 @@ class ShopController extends BaseController {
             ],
 //            [
 //                'name' => '4',
-//                'label' => 'Travel Bonus Products',//旅游积分商品
+//                'label' => 'Travel Fund Products',//旅游积分商品
 //            ],
             [
                 'name' => '5',
-                'label' => 'Car/Villa Bonus Products',//车房积分商品
+                'label' => 'Car/Villa Fund Products',//车房积分商品
             ],
         ];
         return static::notice($data);
@@ -820,4 +820,13 @@ ORDER;
 
         return static::notice(['fileUrl' => $path, 'targetName' => $file_name]);
     }
+
+    /**
+     * 下载申请退货单
+     */
+    public function actionOrderBackingOut()
+    {
+        $file_name = 'orderBackingOut.xlsx';
+        return static::notice(['fileUrl' => $file_name]);
+    }
 }

frontendApi/web/index.php

@@ -1,6 +1,6 @@
 <?php
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_ENV') or define('YII_ENV', 'prod');
 
 require __DIR__ . '/../../vendor/autoload.php';
 require __DIR__ . '/../../vendor/yiisoft/yii2/Yii.php';

frontendEle/src/router/index.js

@@ -78,6 +78,18 @@ export const constantRouterMap = [
                     ],
                 },
             },
+            {
+              path: '/shop/order-backing-out',
+              component: _import('shop/order-backing-out'),
+              name: 'shop_order-list',
+              meta: {
+                  title: '订单退货',//订单退货
+                  breadcrumb: [
+                      {title: 'Dashboard', path: '/dashboard/index'},//首页
+                      {title: 'Shopping Mall', path: '/shop/dec-order-list'},//商城管理
+                  ],
+              }
+            },
             {
                 path: '/shop/order',
                 component: _import('shop/order'),

frontendEle/src/views/shop/order-backing-out.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="white-box">
+    <div class="white-box-footer">
+      <el-result icon="info" title="信息提示" subTitle="下载填写申请退货单后, 发送申请单到客服Email: elkenafrica@gmail.com">
+        <template slot="extra">
+          <el-button type="primary" size="small" @click="handleDownloadFile">申请退货<!-- 下载申请单 --></el-button>
+        </template>
+      </el-result>
+    </div>
+  </div>
+</template>
+
+<script>
+  import network from '@/utils/network'
+  import {SERVER_API_HTTP_TYPE, SERVER_API_DOMAIN} from '@/utils/config'
+
+  export default {
+    name: 'order-backing-out',
+    data() {
+      return {}
+    },
+    methods: {
+      // 下载申请退货单
+      handleDownloadFile() {
+        network.getData(`shop/order-backing-out`).then(response => {
+                    let { fileUrl } = response
+
+                    let downloadElement = document.createElement('a')
+                    downloadElement.target = '_blank'
+                    downloadElement.href = SERVER_API_HTTP_TYPE + SERVER_API_DOMAIN + '/' + fileUrl
+                    // 下载后文件名
+                    downloadElement.download = fileUrl
+                    //点击下载
+                    downloadElement.click()
+                })
+            },
+      },
+  }
+</script>
+
+<style scoped>
+ 
+</style>

frontendEle/src/views/shop/order.vue

@@ -139,9 +139,9 @@
               </div>
           </div>
 
-        <el-dialog title="订单支付" v-if="visible" :visible.sync="visible" width="30%" v-loading="payStackLoading" :before-close="handleClose">
+        <el-dialog title="Pay" v-if="visible" :visible.sync="visible" width="30%" v-loading="payStackLoading" :before-close="handleClose">
             <section>
-                <h1>Lorem Ipsum Dolor Sit Amet</h1>
+<!--                <h1>Lorem Ipsum Dolor Sit Amet</h1>-->
                 <div class="formcontainer">
                     <el-divider></el-divider>
                     <div class="container">
@@ -169,14 +169,14 @@
                 :callback="processPayment"
                 :close="processClose"
             >
-                <el-button type="primary" size="small">支 付</el-button>
+                <el-button type="primary" size="small">Pay</el-button>
 
             </paystack>
-            <el-button type="danger" size="small" class="cancelButton" @click="handleClose">取 消</el-button>
+            <el-button type="danger" size="small" class="cancelButton" @click="handleClose">Cancel</el-button>
         </el-dialog>
 
-        <el-dialog title="提示" :visible.sync="payDialog" :show-close="false" width="350px" :close="handleOrderList">
-          <el-result icon="success" title="支付成功">
+        <el-dialog title="Tips" :visible.sync="payDialog" :show-close="false" width="350px" :close="handleOrderList">
+          <el-result icon="success" title="Successful">
             <template slot="extra">
               <span style="color: #008efa; font-size: 30px;">{{ countdown }}</span>
             </template>
@@ -473,7 +473,7 @@
             // 关闭支付回调
             handleClose() {
                 let _this = this
-                _this.$confirm('确认关闭？').then(() => {
+                _this.$confirm('Confirm to close?').then(() => {
                     return network.postData('shop/delete-approach-order', {orderSn: this.form.orderSn}).then(() => {
                         // 关闭支付模态框
                         _this.visible = false

sql/upgrade/1359.sql

@@ -0,0 +1,138 @@
+-- 删除名车奖、豪宅奖配置
+DELETE FROM `AR_CONFIG` WHERE `CONFIG_NAME` IN ('openTravel', 'openCar', 'openHouse');
+-- 增加车房奖配置
+INSERT INTO `AR_CONFIG` (`CONFIG_NAME`, `TITLE`, `UNIT`, `INPUT_TYPE`, `OPTIONS`, `VALUE`, `TYPE`, `SORT`, `CREATED_AT`, `UPDATED_AT`) VALUES ('openTourism', '是否开启旅游奖', NULL, 8, '{\"employLevel\":[\"E121497617216708616\",\"67BE6A4D03C52288E055736AECE8644D\",\"67BE6EA2070D22EBE055736AECE8644D\"],\"declarationLevel\":[\"67ABCB8C1F7D5519E055736AECE8644D\",\"67ABCCE20A9F5553E055736AECE8644D\",\"67ABCE0ECE705575E055736AECE8644D\"]}', '3', 'bonus', 44, 1521085263, 1649063120);
+INSERT INTO `AR_CONFIG` (`CONFIG_NAME`, `TITLE`, `UNIT`, `INPUT_TYPE`, `OPTIONS`, `VALUE`, `TYPE`, `SORT`, `CREATED_AT`, `UPDATED_AT`) VALUES ('openGarage', '是否开启车房奖', NULL, 8,  '{\"employLevel\":[\"67BE6EA2070D22EBE055736AECE8644D\"],\"declarationLevel\":\"67ABCE0ECE705575E055736AECE8644D\"}', '4', 'bonus', 44, 1521085263, 1649063120);
+-- 车房奖个人上限值
+INSERT INTO `AR_CONFIG` (`CONFIG_NAME`, `TITLE`, `UNIT`, `INPUT_TYPE`, `OPTIONS`, `VALUE`, `TYPE`, `SORT`, `CREATED_AT`, `UPDATED_AT`) VALUES ('openGarageCap', '车房奖个人封顶值', '$', 1, '', '10000', 'bonus', 44, 1521085263, 1649063120);
+-- 删除无用车房游列
+ALTER TABLE `AR_CALC_BONUS` DROP COLUMN `BONUS_TRAVEL`;
+ALTER TABLE `AR_CALC_BONUS` DROP COLUMN `BONUS_CAR`;
+ALTER TABLE `AR_CALC_BONUS` DROP COLUMN `BONUS_HOUSE`;
+-- 增加旅游奖、车房奖
+ALTER TABLE `AR_CALC_BONUS` ADD COLUMN `BONUS_TOURISM` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '旅游奖';
+ALTER TABLE `AR_CALC_BONUS` ADD COLUMN `BONUS_GARAGE`  decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '车房奖';
+-- 车房积分调整
+DELETE FROM `AR_DEAL_TYPE` WHERE ID IN ('365753716726435840', '365343108638052352', '364305230252347392', '364305038266470400', '364305160249413632', '365343018452127744', '365343060634243072', '365753533326299136', '365753643942678528');
+INSERT INTO `AR_DEAL_TYPE` (`ID`, `TYPE_NAME`, `CREATE_ADMIN`, `UPDATE_ADMIN`, `CREATE_REMARK`, `UPDATE_REMARK`, `IS_PRESET`, `IS_ENABLE`, `CREATED_AT`, `UPDATED_AT`, `SORT_ORDER`) VALUES ('364305038266470400', '旅游积分发放', '', NULL, '', NULL, 1, 1, 1652079974, 0, 1);
+INSERT INTO `AR_DEAL_TYPE` (`ID`, `TYPE_NAME`, `CREATE_ADMIN`, `UPDATE_ADMIN`, `CREATE_REMARK`, `UPDATE_REMARK`, `IS_PRESET`, `IS_ENABLE`, `CREATED_AT`, `UPDATED_AT`, `SORT_ORDER`) VALUES ('364305160249413632', '车房积分发放', '', NULL, '', NULL, 1, 1, 1652080003, 0, 1);
+INSERT INTO `AR_DEAL_TYPE` (`ID`, `TYPE_NAME`, `CREATE_ADMIN`, `UPDATE_ADMIN`, `CREATE_REMARK`, `UPDATE_REMARK`, `IS_PRESET`, `IS_ENABLE`, `CREATED_AT`, `UPDATED_AT`, `SORT_ORDER`) VALUES ('365343018452127744', '旅游积分兑换', '', NULL, '', NULL, 1, 1, 1652327448, 0, 1);
+INSERT INTO `AR_DEAL_TYPE` (`ID`, `TYPE_NAME`, `CREATE_ADMIN`, `UPDATE_ADMIN`, `CREATE_REMARK`, `UPDATE_REMARK`, `IS_PRESET`, `IS_ENABLE`, `CREATED_AT`, `UPDATED_AT`, `SORT_ORDER`) VALUES ('365343060634243072', '车房积分兑换', '', NULL, '', NULL, 1, 1, 1652327459, 0, 1);
+INSERT INTO `AR_DEAL_TYPE` (`ID`, `TYPE_NAME`, `CREATE_ADMIN`, `UPDATE_ADMIN`, `CREATE_REMARK`, `UPDATE_REMARK`, `IS_PRESET`, `IS_ENABLE`, `CREATED_AT`, `UPDATED_AT`, `SORT_ORDER`) VALUES ('365753533326299136', '旅游积分余额调整', '', NULL, '', NULL, 0, 1, 1652425322, 0, 1);
+INSERT INTO `AR_DEAL_TYPE` (`ID`, `TYPE_NAME`, `CREATE_ADMIN`, `UPDATE_ADMIN`, `CREATE_REMARK`, `UPDATE_REMARK`, `IS_PRESET`, `IS_ENABLE`, `CREATED_AT`, `UPDATED_AT`, `SORT_ORDER`) VALUES ('365753643942678528', '车房积分余额调整', '', NULL, '', NULL, 0, 1, 1652425349, 0, 1);
+-- 删除车房表
+DROP TABLE `AR_FLOW_ZONE_POINTS`;
+-- 创建旅游积分流水
+CREATE TABLE `AR_FLOW_TOURISM_POINTS` (
+  `ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `USER_ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `LAST_DEC_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `LAST_EMP_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `LAST_STAR_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `LAST_STATUS` tinyint(1) NOT NULL DEFAULT 0,
+  `CALC_ID` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
+  `AMOUNT` decimal(16,3) NOT NULL DEFAULT 0.000,
+  `AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '奖金数额-标准数值',
+  `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.0000 COMMENT '汇率',
+  `TOTAL` decimal(16,3) NOT NULL DEFAULT 0.000,
+  `IS_INCR` tinyint(1) NOT NULL DEFAULT 1,
+  `REMARK` varchar(255) COLLATE utf8mb4_bin NOT NULL,
+  `REMARK_IS_SHOW` tinyint(1) NOT NULL DEFAULT 1,
+  `DEAL_TYPE_ID` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
+  `DEAL_TYPE_IS_PRESET` tinyint(1) NOT NULL DEFAULT 1,
+  `ADMIN_NAME` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
+  `PERIOD_NUM` int(10) NOT NULL,
+  `CALC_MONTH` int(10) NOT NULL,
+  `P_MONTH` date NOT NULL,
+  `CREATED_AT` int(10) NOT NULL,
+  `DELETED` tinyint(1) NOT NULL DEFAULT 0,
+  `DELETED_AT` int(10) NOT NULL DEFAULT 0,
+  `TRANSFER_SN` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `SORT` int(10) NOT NULL DEFAULT 0,
+  `AUTO_SORT` int(10) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `IDX_USER_ID` (`USER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='旅游积分流水';
+-- 创建车房积分流水
+CREATE TABLE `AR_FLOW_GARAGE_POINTS` (
+  `ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `USER_ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `LAST_DEC_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `LAST_EMP_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `LAST_STAR_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `LAST_STATUS` tinyint(1) NOT NULL DEFAULT 0,
+  `CALC_ID` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
+  `AMOUNT` decimal(16,3) NOT NULL DEFAULT 0.000,
+  `AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '奖金数额-标准数值',
+  `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.0000 COMMENT '汇率',
+  `TOTAL` decimal(16,3) NOT NULL DEFAULT 0.000,
+  `IS_INCR` tinyint(1) NOT NULL DEFAULT 1,
+  `REMARK` varchar(255) COLLATE utf8mb4_bin NOT NULL,
+  `REMARK_IS_SHOW` tinyint(1) NOT NULL DEFAULT 1,
+  `DEAL_TYPE_ID` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
+  `DEAL_TYPE_IS_PRESET` tinyint(1) NOT NULL DEFAULT 1,
+  `ADMIN_NAME` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL,
+  `PERIOD_NUM` int(10) NOT NULL,
+  `CALC_MONTH` int(10) NOT NULL,
+  `P_MONTH` date NOT NULL,
+  `CREATED_AT` int(10) NOT NULL,
+  `DELETED` tinyint(1) NOT NULL DEFAULT 0,
+  `DELETED_AT` int(10) NOT NULL DEFAULT 0,
+  `TRANSFER_SN` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `SORT` int(10) NOT NULL DEFAULT 0,
+  `AUTO_SORT` int(10) NOT NULL DEFAULT 0,
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `IDX_USER_ID` (`USER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='车房积分流水';
+-- 删除用户账户奖金类型
+ALTER TABLE `AR_USER_BONUS` DROP COLUMN `TRAVEL_POINTS`;
+ALTER TABLE `AR_USER_BONUS` DROP COLUMN `TRAVEL_POINTS_TOTAL`;
+ALTER TABLE `AR_USER_BONUS` DROP COLUMN `CAR_POINTS`;
+ALTER TABLE `AR_USER_BONUS` DROP COLUMN `CAR_POINTS_TOTAL`;
+ALTER TABLE `AR_USER_BONUS` DROP COLUMN `HOUSE_POINTS`;
+ALTER TABLE `AR_USER_BONUS` DROP COLUMN `HOUSE_POINTS_TOTAL`;
+-- 新增用户账户奖金类型
+ALTER TABLE `AR_USER_BONUS` ADD COLUMN `TOURISM_POINTS` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '旅游积分';
+ALTER TABLE `AR_USER_BONUS` ADD COLUMN `TOURISM_POINTS_TOTAL` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '旅游积分累计';
+ALTER TABLE `AR_USER_BONUS` ADD COLUMN `GARAGE_POINTS` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '车房积分';
+ALTER TABLE `AR_USER_BONUS` ADD COLUMN `GARAGE_POINTS_TOTAL` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '车房积分累计';
+-- 删除车房旅游奖总表
+DROP TABLE `AR_CALC_BONUS_ZONE`;
+CREATE TABLE `AR_CALC_BONUS_TOURISM` (
+  `ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `USER_ID` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '会员ID',
+  `LAST_DEC_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '结算时会员等级',
+  `LAST_EMP_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '计算时会员聘级',
+  `LAST_STAR_LV` varchar(32) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '计算时会员星级',
+  `LEVEL_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '会员最新聘级.聘级ID,对应AR_EMPLOY_LEVEL表主键',
+  `LAST_STATUS` tinyint(1) NOT NULL DEFAULT 0 COMMENT '结算时状态',
+  `AMOUNT` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '奖金数',
+  `POINT` float(10,4) unsigned NOT NULL DEFAULT 0.0000 COMMENT '奖金比例',
+  `PERIOD_NUM` int(10) NOT NULL COMMENT '结算期数',
+  `CALC_YEAR` int(10) NOT NULL COMMENT '结算年份',
+  `CALC_MONTH` int(10) NOT NULL COMMENT '结算月份',
+  `P_CALC_MONTH` date NOT NULL,
+  `LOGS` varchar(2000) COLLATE utf8mb4_bin DEFAULT '',
+  `CREATED_AT` int(10) NOT NULL COMMENT '创建时间',
+  KEY `USER_ID` (`USER_ID`),
+  KEY `PERIOD_NUM` (`PERIOD_NUM`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='旅游奖结算记录';
+CREATE TABLE `AR_CALC_BONUS_GARAGE` (
+  `ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `USER_ID` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '会员ID',
+  `LAST_DEC_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '结算时会员等级',
+  `LAST_EMP_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '计算时会员聘级',
+  `LAST_STAR_LV` varchar(32) CHARACTER SET utf8mb4 DEFAULT '' COMMENT '计算时会员星级',
+  `LEVEL_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '会员最新聘级.聘级ID,对应AR_EMPLOY_LEVEL表主键',
+  `LAST_STATUS` tinyint(1) NOT NULL DEFAULT 0 COMMENT '结算时状态',
+  `AMOUNT` decimal(16,3) NOT NULL DEFAULT 0.000 COMMENT '奖金数',
+  `POINT` float(10,4) unsigned NOT NULL DEFAULT 0.0000 COMMENT '奖金比例',
+  `PERIOD_NUM` int(10) NOT NULL COMMENT '结算期数',
+  `CALC_YEAR` int(10) NOT NULL COMMENT '结算年份',
+  `CALC_MONTH` int(10) NOT NULL COMMENT '结算月份',
+  `P_CALC_MONTH` date NOT NULL,
+  `LOGS` varchar(2000) COLLATE utf8mb4_bin DEFAULT '',
+  `CREATED_AT` int(10) NOT NULL COMMENT '创建时间',
+  KEY `USER_ID` (`USER_ID`),
+  KEY `PERIOD_NUM` (`PERIOD_NUM`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='车房奖结算记录';

sql/upgrade/1494.sql

@@ -0,0 +1,192 @@
+
+DROP TABLE IF EXISTS `AR_PERIOD`;
+CREATE TABLE `AR_PERIOD`  (
+  `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
+  `PERIOD_NUM` int(10) NOT NULL,
+  `CALC_MONTH` tinyint(2) NOT NULL,
+  `CALC_YEAR` int(4) NOT NULL,
+  `START_TIME` int(10) NOT NULL,
+  `END_TIME` int(10) NOT NULL,
+  `IS_MONTH` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_YEAR` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_CLOSED` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_PERFED` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_CALCULATED` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_SENT` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_PERFING` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_CALCING` tinyint(1) NOT NULL DEFAULT 0,
+  `IS_SENDING` tinyint(1) NOT NULL DEFAULT 0,
+  `PERF_PERCENT` int(3) NOT NULL DEFAULT 0,
+  `CALC_PERCENT` int(3) NOT NULL DEFAULT 0,
+  `SENT_PERCENT` int(3) NOT NULL DEFAULT 0,
+  `PERF_ADMIN_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `CLOSE_ADMIN_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `CALC_ADMIN_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `SENT_ADMIN_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
+  `CLOSED_AT` int(10) NULL DEFAULT NULL,
+  `PERF_STARTED_AT` int(10) NOT NULL DEFAULT 0,
+  `PERFED_AT` int(10) NOT NULL DEFAULT 0,
+  `CALCULATE_STARTED_AT` int(10) NOT NULL DEFAULT 0,
+  `CALCULATED_AT` int(10) NOT NULL DEFAULT 0,
+  `SEND_STARTED_AT` int(10) NOT NULL DEFAULT 0,
+  `SENT_AT` int(10) NOT NULL DEFAULT 0,
+  `CREATED_AT` int(10) NOT NULL,
+  `WEEK_NUMBER` tinyint(1) NOT NULL DEFAULT 0 COMMENT '第几周',
+  `CALC_WEEKEND` tinyint(4) NOT NULL DEFAULT 1 COMMENT '结算周',
+  PRIMARY KEY (`ID`) USING BTREE,
+  UNIQUE INDEX `PERIOD_NUM`(`PERIOD_NUM`) USING BTREE,
+  INDEX `IS_CLOSED`(`IS_CLOSED`) USING BTREE,
+  INDEX `IS_PERFED`(`IS_PERFED`) USING BTREE,
+  INDEX `IS_CALCULATED`(`IS_CALCULATED`) USING BTREE,
+  INDEX `IS_SENT`(`IS_SENT`) USING BTREE,
+  INDEX `IS_PERFING`(`IS_PERFING`) USING BTREE,
+  INDEX `IS_CALCING`(`IS_CALCING`) USING BTREE,
+  INDEX `IS_SENDING`(`IS_SENDING`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_bin COMMENT = '期数' ROW_FORMAT = Dynamic;
+
+
+INSERT INTO `AR_PERIOD` VALUES ('74366119808471000', 99, 12, 2021, 1639584000, 1640966399, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478027, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('74366119816859600', 100, 1, 2022, 1640966400, 1642262399, 0, 0, 1, 1, 1, 1, 0, 0, 0, 100, 100, 100, '354832362066022400', '354832362066022400', NULL, '354832362066022400', 1654480135, 1654479476, 1654479878, 1654479878, 1654479878, 1654479958, 1654479958, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('74366119821053900', 101, 1, 2022, 1642262400, 1643644799, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, '354832362066022400', NULL, NULL, 1654480148, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('74731914547826600', 102, 2, 2022, 1643644800, 1644940799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478041, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999642517500', 103, 2, 2022, 1644940800, 1646063999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478046, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999667683300', 104, 3, 2022, 1646064000, 1647359999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478051, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999692849100', 105, 3, 2022, 1647360000, 1648742399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478056, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999713820600', 106, 4, 2022, 1648742400, 1650038399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478061, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999738986400', 107, 4, 2022, 1650038400, 1651334399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478066, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999759958000', 108, 5, 2022, 1651334400, 1652630399, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478071, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999780929500', 109, 5, 2022, 1652630400, 1654012799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 1654478076, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999806095300', 110, 6, 2022, 1654012800, 1655308799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, '354832362066022400', NULL, NULL, 1654478237, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999831261100', 111, 6, 2022, 1655308800, 1656604799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, '354832362066022400', NULL, NULL, 1654478591, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999852232700', 112, 7, 2022, 1656604800, 1657900799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, '354832362066022400', NULL, NULL, 1654478608, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999873204200', 113, 7, 2022, 1657900800, 1659283199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999894175700', 114, 8, 2022, 1659283200, 1660579199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, '354832362066022400', NULL, NULL, 1654479454, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999919341500', 115, 8, 2022, 1660579200, 1661961599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999940313000', 116, 9, 2022, 1661961600, 1663257599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75772999961284600', 117, 9, 2022, 1663257600, 1664553599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75772999982256100', 118, 10, 2022, 1664553600, 1665849599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000007421900', 119, 10, 2022, 1665849600, 1667231999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000032587700', 120, 11, 2022, 1667232000, 1668527999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000053559200', 121, 11, 2022, 1668528000, 1669823999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000074530800', 122, 12, 2022, 1669824000, 1671119999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000095502300', 123, 12, 2022, 1671120000, 1672502399, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000141639600', 124, 1, 2023, 1672502400, 1673798399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000166805500', 125, 1, 2023, 1673798400, 1675180799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000187777000', 126, 2, 2023, 1675180800, 1676476799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000208748500', 127, 2, 2023, 1676476800, 1677599999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000225525700', 128, 3, 2023, 1677600000, 1678895999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000250691500', 129, 3, 2023, 1678896000, 1680278399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000271663100', 130, 4, 2023, 1680278400, 1681574399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000292634600', 131, 4, 2023, 1681574400, 1682870399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000313606100', 132, 5, 2023, 1682870400, 1684166399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000338771900', 133, 5, 2023, 1684166400, 1685548799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000359743400', 134, 6, 2023, 1685548800, 1686844799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000380715000', 135, 6, 2023, 1686844800, 1688140799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000401686500', 136, 7, 2023, 1688140800, 1689436799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000426852300', 137, 7, 2023, 1689436800, 1690819199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000447823800', 138, 8, 2023, 1690819200, 1692115199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000468795300', 139, 8, 2023, 1692115200, 1693497599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000493961200', 140, 9, 2023, 1693497600, 1694793599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000514932700', 141, 9, 2023, 1694793600, 1696089599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000540098500', 142, 10, 2023, 1696089600, 1697385599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000565264300', 143, 10, 2023, 1697385600, 1698767999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000586235900', 144, 11, 2023, 1698768000, 1700063999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000611401700', 145, 11, 2023, 1700064000, 1701359999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000644956100', 146, 12, 2023, 1701360000, 1702655999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000665927600', 147, 12, 2023, 1702656000, 1704038399, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000686899200', 148, 1, 2024, 1704038400, 1705334399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000707870700', 149, 1, 2024, 1705334400, 1706716799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000733036500', 150, 2, 2024, 1706716800, 1708012799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000754008000', 151, 2, 2024, 1708012800, 1709222399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000774979500', 152, 3, 2024, 1709222400, 1710518399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000800145400', 153, 3, 2024, 1710518400, 1711900799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000821116900', 154, 4, 2024, 1711900800, 1713196799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000846282700', 155, 4, 2024, 1713196800, 1714492799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000867254200', 156, 5, 2024, 1714492800, 1715788799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000888225700', 157, 5, 2024, 1715788800, 1717171199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000909197300', 158, 6, 2024, 1717171200, 1718467199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000934363100', 159, 6, 2024, 1718467200, 1719763199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000955334600', 160, 7, 2024, 1719763200, 1721059199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773000976306100', 161, 7, 2024, 1721059200, 1722441599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773000997277600', 162, 8, 2024, 1722441600, 1723737599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001022443500', 163, 8, 2024, 1723737600, 1725119999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001043415000', 164, 9, 2024, 1725120000, 1726415999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001064386500', 165, 9, 2024, 1726416000, 1727711999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001085358000', 166, 10, 2024, 1727712000, 1729007999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001106329600', 167, 10, 2024, 1729008000, 1730390399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001131495400', 168, 11, 2024, 1730390400, 1731686399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001152466900', 169, 11, 2024, 1731686400, 1732982399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001173438400', 170, 12, 2024, 1732982400, 1734278399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001194409900', 171, 12, 2024, 1734278400, 1735660799, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001219575800', 172, 1, 2025, 1735660800, 1736956799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001240547300', 173, 1, 2025, 1736956800, 1738339199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001261518800', 174, 2, 2025, 1738339200, 1739635199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001282490300', 175, 2, 2025, 1739635200, 1740758399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001307656100', 176, 3, 2025, 1740758400, 1742054399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001328627700', 177, 3, 2025, 1742054400, 1743436799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001345404900', 178, 4, 2025, 1743436800, 1744732799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001370570700', 179, 4, 2025, 1744732800, 1746028799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001391542200', 180, 5, 2025, 1746028800, 1747324799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001412513700', 181, 5, 2025, 1747324800, 1748707199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001433485300', 182, 6, 2025, 1748707200, 1750003199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001454456800', 183, 6, 2025, 1750003200, 1751299199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001475428300', 184, 7, 2025, 1751299200, 1752595199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001500594100', 185, 7, 2025, 1752595200, 1753977599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001550925800', 186, 8, 2025, 1753977600, 1755273599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001576091600', 187, 8, 2025, 1755273600, 1756655999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001597063100', 188, 9, 2025, 1756656000, 1757951999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001618034600', 189, 9, 2025, 1757952000, 1759247999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001639006200', 190, 10, 2025, 1759248000, 1760543999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001659977700', 191, 10, 2025, 1760544000, 1761926399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001680949200', 192, 11, 2025, 1761926400, 1763222399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001701920700', 193, 11, 2025, 1763222400, 1764518399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001727086500', 194, 12, 2025, 1764518400, 1765814399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001748058100', 195, 12, 2025, 1765814400, 1767196799, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001769029600', 196, 1, 2026, 1767196800, 1768492799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001790001100', 197, 1, 2026, 1768492800, 1769875199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001815166900', 198, 2, 2026, 1769875200, 1771171199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001836138400', 199, 2, 2026, 1771171200, 1772294399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001857110000', 200, 3, 2026, 1772294400, 1773590399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001878081500', 201, 3, 2026, 1773590400, 1774972799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001899053000', 202, 4, 2026, 1774972800, 1776268799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001924218800', 203, 4, 2026, 1776268800, 1777564799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001945190400', 204, 5, 2026, 1777564800, 1778860799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773001966161900', 205, 5, 2026, 1778860800, 1780243199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773001987133400', 206, 6, 2026, 1780243200, 1781539199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002012299200', 207, 6, 2026, 1781539200, 1782835199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002033270700', 208, 7, 2026, 1782835200, 1784131199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002054242300', 209, 7, 2026, 1784131200, 1785513599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002079408100', 210, 8, 2026, 1785513600, 1786809599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002100379600', 211, 8, 2026, 1786809600, 1788191999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002125545400', 212, 9, 2026, 1788192000, 1789487999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002146516900', 213, 9, 2026, 1789488000, 1790783999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002167488500', 214, 10, 2026, 1790784000, 1792079999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002192654300', 215, 10, 2026, 1792080000, 1793462399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002213625800', 216, 11, 2026, 1793462400, 1794758399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002234597300', 217, 11, 2026, 1794758400, 1796054399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002259763200', 218, 12, 2026, 1796054400, 1797350399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002280734700', 219, 12, 2026, 1797350400, 1798732799, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002301706200', 220, 1, 2027, 1798732800, 1800028799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002322677700', 221, 1, 2027, 1800028800, 1801411199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002343649200', 222, 2, 2027, 1801411200, 1802707199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002364620800', 223, 2, 2027, 1802707200, 1803830399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002389786600', 224, 3, 2027, 1803830400, 1805126399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002410758100', 225, 3, 2027, 1805126400, 1806508799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002431729600', 226, 4, 2027, 1806508800, 1807804799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002452701100', 227, 4, 2027, 1807804800, 1809100799, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002477867000', 228, 5, 2027, 1809100800, 1810396799, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002498838500', 229, 5, 2027, 1810396800, 1811779199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002519810000', 230, 6, 2027, 1811779200, 1813075199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002540781500', 231, 6, 2027, 1813075200, 1814371199, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002561753000', 232, 7, 2027, 1814371200, 1815667199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002586918900', 233, 7, 2027, 1815667200, 1817049599, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002607890400', 234, 8, 2027, 1817049600, 1818345599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002633056200', 235, 8, 2027, 1818345600, 1819727999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002654027700', 236, 9, 2027, 1819728000, 1821023999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002674999200', 237, 9, 2027, 1821024000, 1822319999, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002695970800', 238, 10, 2027, 1822320000, 1823615999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002716942300', 239, 10, 2027, 1823616000, 1824998399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002737913800', 240, 11, 2027, 1824998400, 1826294399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002763079600', 241, 11, 2027, 1826294400, 1827590399, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);
+INSERT INTO `AR_PERIOD` VALUES ('75773002788245500', 242, 12, 2027, 1827590400, 1828886399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 1);
+INSERT INTO `AR_PERIOD` VALUES ('75773002809217000', 243, 12, 2027, 1828886400, 1830268799, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 1654477594, 0, 2);

sql/upgrade/1548.sql

@@ -0,0 +1,46 @@
+-- 聘级表增加旅游奖比例、车房奖比例
+ALTER TABLE `AR_EMPLOY_LEVEL` ADD COLUMN `TOURISM_PERCENT` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '旅游奖比例';
+ALTER TABLE `AR_EMPLOY_LEVEL` ADD COLUMN `GARAGE_PERCENT` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '车房奖比例';
+-- 更新聘级表中旅游奖、车房奖比例
+UPDATE `AR_EMPLOY_LEVEL` SET `TOURISM_PERCENT` = 1.0, `GARAGE_PERCENT` = 1.0 WHERE ID = 'E121497617216708616';
+UPDATE `AR_EMPLOY_LEVEL` SET `TOURISM_PERCENT` = 1.1, `GARAGE_PERCENT` = 1.5 WHERE ID = '67BE6A4D03C52288E055736AECE8644D';
+UPDATE `AR_EMPLOY_LEVEL` SET `TOURISM_PERCENT` = 1.2, `GARAGE_PERCENT` = 2.0 WHERE ID = '67BE6EA2070D22EBE055736AECE8644D';
+UPDATE `AR_EMPLOY_LEVEL` SET `TOURISM_PERCENT` = 1.3, `GARAGE_PERCENT` = 2.5 WHERE ID = '67BE742A336F2370E055736AECE8644D';
+UPDATE `AR_EMPLOY_LEVEL` SET `TOURISM_PERCENT` = 1.4, `GARAGE_PERCENT` = 3.0 WHERE ID = '67BE805032C22492E055736AECE8644D';
+-- 新增荣衔星级表
+CREATE TABLE `AR_STAR_LEVEL` (
+  `ID` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT 'ID',
+  `LEVEL_NAME` varchar(48) COLLATE utf8mb4_bin NOT NULL COMMENT '级别名称',
+  `ICON_TYPE` tinyint(1) NOT NULL DEFAULT 0 COMMENT '图表类型',
+  `ICON_NUM` tinyint(2) NOT NULL DEFAULT 0 COMMENT '图标个数',
+  `MIN_LEVEL_ID` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '上级ID',
+  `LEVEL_SCORE` decimal(12,2) unsigned NOT NULL DEFAULT 0.00 COMMENT '级别分数',
+  `UPGRADE_SCORE` decimal(12,2) unsigned NOT NULL DEFAULT 0.00 COMMENT '升级分数',
+  `SORT` int(10) unsigned NOT NULL DEFAULT 0 COMMENT '排序值',
+  `TOURISM_PERCENT` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '旅游奖比例',
+  `GARAGE_PERCENT` decimal(16,2) NOT NULL DEFAULT 0.00 COMMENT '车房奖比例',
+  `CREATED_AT` int(10) NOT NULL COMMENT '创建时间',
+  `UPDATED_AT` int(10) NOT NULL DEFAULT 0 COMMENT '更新时间',
+  `CREATE_ADMIN` varchar(32) COLLATE utf8mb4_bin NOT NULL COMMENT '创建管理员',
+  `UPDATE_ADMIN` varchar(32) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '更新管理员',
+  PRIMARY KEY (`ID`) USING BTREE,
+  UNIQUE KEY `LEVEL_NAME` (`LEVEL_NAME`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='荣衔星级表';
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('DCBEDD8E0EAD3DF59D81CCC0C2ACAEFF', '0-Star Crown', 2, 0, ' ', 0.00, 10000.00, 0, 0.00, 0.00, 1655779138, 1655779138, 'admin', 'admin');
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('E0B75B89C94F35EF8EE0054FA34B759C', '1-Star Crown', 2, 0, 'DCBEDD8E0EAD3DF59D81CCC0C2ACAEFF', 10000.00, 20000.00, 1, 1.50, 3.50, 1655779138, 1655779138, 'admin', 'admin');
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('7FEBE5DE95D530578915F4072E7CD842', '2-Star Crown', 2, 0, 'E0B75B89C94F35EF8EE0054FA34B759C', 20000.00, 35000.00, 2, 2.00, 4.00, 1655779138, 1655779138, 'admin', 'admin');
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('391691E01CD5373F8D23F01FAD750222', '3-Star Crown', 2, 0, '7FEBE5DE95D530578915F4072E7CD842', 35000.00, 50000.00, 3, 2.50, 4.50, 1655779138, 1655779138, 'admin', 'admin');
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('8ACAEA736F5331B79283C895F36084E5', '4-Star Crown', 2, 0, '391691E01CD5373F8D23F01FAD750222', 50000.00, 100000.00, 4, 3.00, 5.00, 1655779138, 1655779138, 'admin', 'admin');
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('CE46B39D07633217AA5711438649D1D6', '5-Star Crown', 2, 0, '8ACAEA736F5331B79283C895F36084E5', 100000.00, 250000.00, 5, 3.50, 5.50, 1655779138, 1655779138, 'admin', 'admin');
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('24396B85E74A3005947F1F90EBA5F5CF', '6-Star Crown', 2, 0, 'CE46B39D07633217AA5711438649D1D6', 250000.00, 500000.00, 6, 4.00, 6.00, 1655779138, 1655779138, 'admin', 'admin');
+INSERT INTO `AR_STAR_LEVEL` (`ID`, `LEVEL_NAME`, `ICON_TYPE`, `ICON_NUM`, `MIN_LEVEL_ID`, `LEVEL_SCORE`, `UPGRADE_SCORE`, `SORT`, `TOURISM_PERCENT`, `GARAGE_PERCENT`, `CREATED_AT`, `UPDATED_AT`, `CREATE_ADMIN`, `UPDATE_ADMIN`) VALUES ('8C253968EB6F3F3FA5BE84F63136FFFA', '7-Star Crown', 2, 0, '24396B85E74A3005947F1F90EBA5F5CF', 500000.00, 100000000.00, 7, 4.50, 6.50, 1655779138, 1655779138, 'admin', 'admin');
+-- 团队奖/绩效奖增加最新星级
+ALTER TABLE `AR_CALC_BONUS_QY` ADD COLUMN `LAST_STAR_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '最新星级' AFTER `LAST_EMP_LV`;
+-- 奖金表增加用户星级
+ALTER TABLE `AR_CALC_BONUS` ADD COLUMN `LAST_STAR_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '最新星级' AFTER `LAST_EMP_LV`;
+-- 用户表增加星级
+ALTER TABLE `AR_USER` ADD COLUMN `STAR_LV` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '最新星级' AFTER `EMP_LV`;
+-- 更新团队奖/绩效奖个人奖金封顶值
+UPDATE `AR_DECLARATION_LEVEL` SET `INCOME_CAP` = 1500 WHERE ID = '67ABCB8C1F7D5519E055736AECE8644D';
+UPDATE `AR_DECLARATION_LEVEL` SET `INCOME_CAP` = 10000 WHERE ID = '67ABCCE20A9F5553E055736AECE8644D';
+UPDATE `AR_DECLARATION_LEVEL` SET `INCOME_CAP` = 50000 WHERE ID = '67ABCE0ECE705575E055736AECE8644D';

sql/upgrade/1559.sql

@@ -0,0 +1,40 @@
+-- 增加汇率配置
+INSERT INTO `AR_CONFIG` (`CONFIG_NAME`, `TITLE`, `UNIT`, `INPUT_TYPE`, `OPTIONS`, `VALUE`, `TYPE`, `SORT`, `CREATED_AT`, `UPDATED_AT`) VALUES ('exchangeRate', '汇率配置', NULL, 1, NULL, '15.66', '', 16, 1521085263, 1654497631);
+
+
+-- 商品增加标准价格属性、汇率
+ALTER TABLE `AR_SHOP_GOODS` ADD COLUMN `SELL_PRICE_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '标准价格' AFTER `SELL_PRICE`;
+
+
+-- 套餐商品增加标准价格属性、汇率
+ALTER TABLE `AR_DECLARATION_PACKAGE` ADD COLUMN `AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '标准价格' AFTER `PV`;
+
+
+
+-- 商品增加标准价格属性、汇率
+ALTER TABLE `AR_ORDER_GOODS` ADD COLUMN `STANDARD_PRICE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '标准价格' AFTER `REAL_PV`;
+ALTER TABLE `AR_ORDER_GOODS` ADD COLUMN `REAL_STANDARD_PRICE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '支付标准价格' AFTER `STANDARD_PRICE`;
+ALTER TABLE `AR_ORDER_GOODS` ADD COLUMN `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.00 COMMENT '汇率' AFTER `STANDARD_PRICE`;
+
+
+-- 商品增加标准价格属性、汇率
+ALTER TABLE `AR_ORDER` ADD COLUMN `ORDER_AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '订单价格-标准价格' AFTER `PAY_PV`;
+ALTER TABLE `AR_ORDER` ADD COLUMN `PAY_AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '支付金额-标准价格' AFTER `ORDER_AMOUNT_STANDARD`;
+ALTER TABLE `AR_ORDER` ADD COLUMN `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.00 COMMENT '汇率' AFTER `PAY_AMOUNT_STANDARD`;
+
+
+
+
+-- 会员奖金流水增加奖金数额-标准数值、汇率
+ALTER TABLE `AR_FLOW_BONUS` ADD COLUMN `AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '奖金数额-标准数值' AFTER `AMOUNT`;
+ALTER TABLE `AR_FLOW_BONUS` ADD COLUMN `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.00 COMMENT '汇率' AFTER `AMOUNT_STANDARD`;
+
+
+-- 会员旅游、车房奖金流水增加奖金数额-标准数值、汇率
+ALTER TABLE `AR_FLOW_ZONE_POINTS` ADD COLUMN `AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '奖金数额-标准数值' AFTER `AMOUNT`;
+ALTER TABLE `AR_FLOW_ZONE_POINTS` ADD COLUMN `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.00 COMMENT '汇率' AFTER `AMOUNT_STANDARD`;
+
+
+-- 兑换点数增加标准金额、汇率
+ALTER TABLE `AR_FLOW_EXCHANGE_POINTS` ADD COLUMN `AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '奖金数额-标准数值' AFTER `AMOUNT`;
+ALTER TABLE `AR_FLOW_EXCHANGE_POINTS` ADD COLUMN `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.00 COMMENT '汇率' AFTER `AMOUNT_STANDARD`;

sql/upgrade/1602.sql

@@ -0,0 +1,85 @@
+CREATE TABLE `AR_APPROACH_ORDER` (
+  `ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `SN` varchar(32) COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `DEC_SN` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `USER_ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `USER_NAME` varchar(16) COLLATE utf8mb4_bin NOT NULL,
+  `ORDER_TYPE` varchar(12) COLLATE utf8mb4_bin NOT NULL,
+  `ORDER_AMOUNT` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `PV` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `PAY_AMOUNT` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `PAY_PV` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `ORDER_AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '订单价格-标准价格',
+  `PAY_AMOUNT_STANDARD` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '标准价格',
+  `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.0000 COMMENT '汇率',
+  `PAY_AT` int(10) NOT NULL DEFAULT 0,
+  `FREIGHT` float(10,2) NOT NULL DEFAULT 0.00,
+  `PAY_FREIGHT` float(10,2) NOT NULL DEFAULT 0.00,
+  `DELIVERY_STATUS` tinyint(2) NOT NULL DEFAULT 0,
+  `DELIVERY_PERIOD` int(10) NOT NULL DEFAULT 0,
+  `DELIVERY_AT` int(10) NOT NULL DEFAULT 0,
+  `EXPRESS_COMPANY` varchar(128) COLLATE utf8mb4_bin DEFAULT '',
+  `ORDER_TRACK_NO` varchar(32) COLLATE utf8mb4_bin DEFAULT '',
+  `EXPRESS_TYPE` tinyint(1) NOT NULL DEFAULT 0,
+  `FRONT_REMARK` varchar(1000) COLLATE utf8mb4_bin DEFAULT '',
+  `REMARK` text COLLATE utf8mb4_bin DEFAULT NULL,
+  `NOTE` text COLLATE utf8mb4_bin DEFAULT NULL COMMENT '备注内容',
+  `PERIOD_NUM` int(10) NOT NULL DEFAULT 0,
+  `STATUS` int(3) NOT NULL DEFAULT 0,
+  `CONSIGNEE` varchar(120) COLLATE utf8mb4_bin DEFAULT '',
+  `MOBILE` varchar(11) COLLATE utf8mb4_bin DEFAULT '',
+  `TEL` varchar(16) COLLATE utf8mb4_bin DEFAULT '',
+  `PROVINCE` int(6) NOT NULL DEFAULT 0,
+  `CITY` int(6) DEFAULT 0,
+  `COUNTY` int(9) DEFAULT 0,
+  `LGA_NAME` varchar(50) COLLATE utf8mb4_bin DEFAULT NULL,
+  `CITY_NAME` varchar(50) COLLATE utf8mb4_bin DEFAULT NULL,
+  `ADDRESS` varchar(255) COLLATE utf8mb4_bin NOT NULL DEFAULT '',
+  `P_CALC_MONTH` date NOT NULL,
+  `CREATED_AT` int(10) NOT NULL DEFAULT 0,
+  `CREATE_USER` varchar(16) COLLATE utf8mb4_bin NOT NULL,
+  `UPDATED_AT` int(10) NOT NULL DEFAULT 0,
+  `UPDATER` varchar(16) COLLATE utf8mb4_bin DEFAULT '',
+  `IS_DELETE` int(10) NOT NULL DEFAULT 0,
+  `DELETED_AT` int(10) NOT NULL DEFAULT 0,
+  `PAY_TYPE` varchar(32) COLLATE utf8mb4_bin NOT NULL DEFAULT 'cash',
+  `WAREHOUSE` varchar(16) COLLATE utf8mb4_bin NOT NULL DEFAULT '01',
+  `EMAIL` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '邮箱',
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `SN` (`SN`) USING BTREE,
+  KEY `USER_ID` (`USER_ID`) USING BTREE,
+  KEY `USER_NAME` (`USER_NAME`) USING BTREE,
+  KEY `PERIOD_NUM` (`PERIOD_NUM`) USING BTREE,
+  KEY `IS_DELETE` (`IS_DELETE`) USING BTREE,
+  KEY `ORDER_TYPE` (`ORDER_TYPE`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='商品中间订单';
+
+CREATE TABLE `AR_APPROACH_ORDER_GOODS` (
+  `ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `ORDER_SN` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `GOODS_ID` varchar(32) COLLATE utf8mb4_bin NOT NULL,
+  `GOODS_TITLE` varchar(255) COLLATE utf8mb4_bin NOT NULL,
+  `PRICE` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `REAL_PRICE` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `PV` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `REAL_PV` decimal(16,2) NOT NULL DEFAULT 0.00,
+  `STANDARD_PRICE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '标准价格',
+  `REAL_STANDARD_PRICE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '支付标准价格',
+  `EXCHANGE_RATE` float(10,4) NOT NULL DEFAULT 0.0000 COMMENT '汇率',
+  `TAX_RATE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '税率',
+  `SKU_CODE` varchar(16) COLLATE utf8mb4_bin NOT NULL,
+  `BUY_NUMS` int(10) NOT NULL DEFAULT 0,
+  `P_CALC_MONTH` date NOT NULL,
+  `POINT` smallint(5) unsigned NOT NULL DEFAULT 0,
+  `CATEGORY_TYPE` tinyint(1) unsigned NOT NULL DEFAULT 1 COMMENT '商品分类：1普通商品 4旅游积分商品 5名车积分商品 6豪宅积分商品',
+  `PAY_TYPE` varchar(30) COLLATE utf8mb4_bin NOT NULL DEFAULT 'cash' COMMENT '支付方式：1-cash-余额支付 3-exchange-兑换点数 4-travel_points-旅游积分 5-car_points-名车积分 6-house_points-豪宅积分',
+  `EMAIL` varchar(32) COLLATE utf8mb4_bin DEFAULT '' COMMENT '邮箱',
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `GOODS_ID` (`GOODS_ID`) USING BTREE,
+  KEY `ORDER_SN` (`ORDER_SN`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC COMMENT='订单中包含的商品';
+
+
+
+-- 订单表增加NOTE字段,保存PayStack支付订单回调日志
+ALTER TABLE `AR_ORDER` ADD COLUMN `NOTE` text NULL COMMENT '备注内容' AFTER `REMARK`;

sql/upgrade/1608.sql

@@ -0,0 +1,8 @@
+-- 商品增加税率属性
+ALTER TABLE `AR_SHOP_GOODS` ADD COLUMN `TAX_RATE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '税率' AFTER `PRICE_PV`;
+
+-- 订单中间表商品表增加税率税额属性
+ALTER TABLE `AR_APPROACH_ORDER_GOODS` ADD COLUMN `TAX_RATE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '税率' AFTER `EXCHANGE_RATE`;
+
+-- 订单表商品表增加税率税额属性
+ALTER TABLE `AR_ORDER_GOODS` ADD COLUMN `TAX_RATE` float(16,2) NOT NULL DEFAULT 0.00 COMMENT '税率' AFTER `EXCHANGE_RATE`;

yii

@@ -5,7 +5,7 @@
  */
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_ENV') or define('YII_ENV', 'prod');
 
 require __DIR__ . '/vendor/autoload.php';
 require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';