Merge branch 'master' of e.coding.net:g-ueau9358/kku/kku_laravel

* 'master' of e.coding.net:g-ueau9359/kku/kku_laravel:
  feat(config): 更新数据库配置生成命令和相关文档
  1
  feat(farm): 更新配置表生成命令和农场数值文档

app/Console/Commands/GenerateConfigDbCommand.php

@@ -2,6 +2,35 @@
 
 namespace App\Console\Commands;
 
+use App\Module\Farm\Models\FarmFruitGrowthCycle;
+use App\Module\Farm\Models\FarmGodBuff;
+use App\Module\Farm\Models\FarmLandType;
+use App\Module\Farm\Models\FarmLandUpgradeConfig;
+use App\Module\Farm\Models\FarmMysterySeeLandEffect;
+use App\Module\Farm\Models\FarmSeed;
+use App\Module\Farm\Models\FarmSeedOutput;
+use App\Module\Farm\Models\FarmShrineConfig;
+use App\Module\Fund\Models\FundConfigModel;
+use App\Module\Fund\Models\FundCurrencyModel;
+use App\Module\Fund\Models\FundModel;
+use App\Module\GameItems\Models\ItemCategory;
+use App\Module\Mex\Models\MexPriceConfig;
+use App\Module\Pet\Models\PetLevelConfig;
+use App\Module\Pet\Models\PetSkill;
+use App\Module\Point\Models\PointAdminModel;
+use App\Module\Point\Models\PointConfigModel;
+use App\Module\Point\Models\PointCurrencyModel;
+use App\Module\Point\Models\PointModel;
+use App\Module\Shop\Models\ShopCategory;
+use App\Module\Shop\Models\ShopItem;
+use App\Module\ThirdParty\Models\ThirdPartyCredential;
+use App\Module\ThirdParty\Models\ThirdPartyLog;
+use App\Module\ThirdParty\Models\ThirdPartyQuota;
+use App\Module\ThirdParty\Models\ThirdPartyService;
+use App\Module\Transfer\Models\TransferApp;
+use App\Module\Transfer\Services\TransferService;
+use App\Module\UrsPromotion\Models\UrsTalentConfig;
+use App\Module\UrsPromotion\Models\UrsTransferFeeConfig;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Str;
@@ -9,20 +38,80 @@ use Illuminate\Support\Str;
 
 /**
  * 生成配置表的 数据库备份文件
- * 
+ *
+ * php artisan generate:configdb
+ *
  */
 class GenerateConfigDbCommand extends Command
 {
-    protected $signature = 'generate:configdb';
+
+    protected $signature   = 'generate:configdb';
     protected $description = '生成配置表的 数据库备份文件，包含创建语句和插入语句';
 
-    protected $outFile = 'database/sql/configdb.sql';
+    protected $outFile   = 'database/sql/configdb.sql';
     protected $modelList = [
+        // 系统
+        \App\Module\System\Models\SysConfig::class,
+        // 物品
+        \App\Module\GameItems\Models\Item::class,
+        \App\Module\GameItems\Models\ItemCategory::class,
+        \App\Module\GameItems\Models\ItemChestConfig::class,
+        \App\Module\GameItems\Models\ItemDismantleRule::class,
+        \App\Module\GameItems\Models\ItemGroup::class,
+        \App\Module\GameItems\Models\ItemGroupItem::class,
+        \App\Module\GameItems\Models\ItemOutputLimit::class,
+        \App\Module\GameItems\Models\ItemRecipe::class,
+        // Game模块
+        \App\Module\Game\Models\GameConditionGroup::class,
+        \App\Module\Game\Models\GameConditionItem::class,
+        \App\Module\Game\Models\GameConsumeGroup::class,
+        \App\Module\Game\Models\GameConsumeItem::class,
+        \App\Module\Game\Models\GameRewardGroup::class,
+        \App\Module\Game\Models\GameRewardGroupPityCount::class,
+        \App\Module\Game\Models\GameRewardItem::class,
+        \App\Module\Game\Models\GameTag::class,
+        \App\Module\Game\Models\GameTagRelation::class,
+        // 农场
         \App\Module\Farm\Models\FarmConfig::class,
         \App\Module\Farm\Models\FarmShrineConfig::class,
         \App\Module\Farm\Models\FarmHouseConfig::class,
+        FarmFruitGrowthCycle::class,
+        FarmGodBuff::class,
+        FarmLandType::class,
+        FarmLandUpgradeConfig::class,
+        FarmMysterySeeLandEffect::class,
+        FarmSeed::class,
+        FarmSeedOutput::class,
+        FarmShrineConfig::class,
+        // mex
+        MexPriceConfig::class,
+        // 宠物
         \App\Module\Pet\Models\PetConfig::class,
-        \App\Module\System\Models\SysConfig::class,
+        PetLevelConfig::class,
+        PetSkill::class,
+        // urs 推广
+        UrsTalentConfig::class,
+        UrsTransferFeeConfig::class,
+        // Fund 模块
+        FundModel::class,
+        FundConfigModel::class,
+        FundCurrencyModel::class,
+        // Point 模块
+        PointModel::class,
+        PointConfigModel::class,
+        PointCurrencyModel::class,
+        // 三方模块
+        ThirdPartyService::class,
+        ThirdPartyCredential::class,
+        ThirdPartyQuota::class,
+        // 划转模块
+        TransferApp::class,
+        // 商店模块
+        ShopItem::class,
+        ShopCategory::class,
+
+
+
     ];
 
     public function handle()
@@ -43,7 +132,7 @@ class GenerateConfigDbCommand extends Command
         $sqlContent .= "-- 警告: 此文件由系统自动生成，禁止修改！\n";
         $sqlContent .= "-- ******************************************************************\n\n";
 
-        $totalTables = 0;
+        $totalTables  = 0;
         $totalRecords = 0;
 
         // 遍历每个模型
@@ -52,10 +141,10 @@ class GenerateConfigDbCommand extends Command
                 $this->info("处理模型: {$modelClass}");
 
                 // 实例化模型
-                $model = new $modelClass();
-                $connection = $model->getConnection();
+                $model       = new $modelClass();
+                $connection  = $model->getConnection();
                 $tablePrefix = $connection->getTablePrefix();
-                $tableName = $tablePrefix . $model->getTable();
+                $tableName   = $tablePrefix . $model->getTable();
 
                 $this->info("  表名: {$tableName}");
 
@@ -79,7 +168,7 @@ class GenerateConfigDbCommand extends Command
                 $sqlContent .= "{$createTableSQL};\n\n";
 
                 // 获取表数据
-                $records = $connection->table($model->getTable())->get();
+                $records     = $connection->table($model->getTable())->get();
                 $recordCount = $records->count();
 
                 $this->info("  记录数: {$recordCount}");
@@ -89,15 +178,15 @@ class GenerateConfigDbCommand extends Command
                     $sqlContent .= "-- 数据插入\n";
 
                     // 获取字段名
-                    $firstRecord = (array) $records->first();
-                    $columns = array_keys($firstRecord);
-                    $columnList = '`' . implode('`, `', $columns) . '`';
+                    $firstRecord = (array)$records->first();
+                    $columns     = array_keys($firstRecord);
+                    $columnList  = '`' . implode('`, `', $columns) . '`';
 
                     $sqlContent .= "INSERT INTO `{$tableName}` ({$columnList}) VALUES\n";
 
                     $values = [];
                     foreach ($records as $record) {
-                        $recordArray = (array) $record;
+                        $recordArray   = (array)$record;
                         $escapedValues = array_map(function ($value) {
                             if ($value === null) {
                                 return 'NULL';
@@ -107,7 +196,7 @@ class GenerateConfigDbCommand extends Command
                                 return "'" . addslashes($value) . "'";
                             }
                         }, $recordArray);
-                        $values[] = '(' . implode(', ', $escapedValues) . ')';
+                        $values[]      = '(' . implode(', ', $escapedValues) . ')';
                     }
 
                     $sqlContent .= implode(",\n", $values) . ";\n\n";
@@ -152,15 +241,15 @@ class GenerateConfigDbCommand extends Command
      */
     private function formatBytes(int $bytes): string
     {
-        $units = ['B', 'KB', 'MB', 'GB'];
+        $units = [ 'B', 'KB', 'MB', 'GB' ];
         $bytes = max($bytes, 0);
-        $pow = floor(($bytes ? log($bytes) : 0) / log(1024));
-        $pow = min($pow, count($units) - 1);
+        $pow   = floor(($bytes ? log($bytes) : 0) / log(1024));
+        $pow   = min($pow, count($units) - 1);
 
         $bytes /= 1 << 10 * $pow;
 
         return round($bytes, 2) . ' ' . $units[$pow];
     }
 
-    
+
 }

app/Module/Farm/Docs/数值.md

@@ -36,7 +36,7 @@
 
 ##  兑换中心
 
-木材 《= 400萝卜 + 400西瓜
+木材 《= 400苹果 + 400西瓜
 石材 《= 800苹果 + 150南瓜
 刚才 《= 800西瓜 + 150 草莓
 

app/Module/README.md

@@ -17,7 +17,7 @@
 - [Activity - 活动模块](#6-activity---活动模块) 📋
 - [Task - 任务模块](#7-task---任务模块) ✅
 - [Promotion - 团队模块](#8-promotion---团队模块) ✅
-- [Promotionurs - 团队模块（增强版）](#9-promotionurs---团队模块增强版) ✅
+
 
 ### 💰 [资金管理模块](#资金管理模块) (3个)
 - [Fund - 资金模块](#10-fund---资金模块) ✅

app/Module/TransferOld/App.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\Transfer;
+namespace App\Module\TransferOld;
 
-use App\Module\Transfer\Model\TransferApp;
+use App\Module\TransferOld\Model\TransferApp;
 
 class App
 {

app/Module/TransferOld/AutoCall.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Module\Transfer;
+namespace App\Module\TransferOld;
 
 use App\Jobs\TransferOrderInCall;
 use App\Jobs\TransferOrderInCallback;
 use App\Module\Outside\Http;
-use App\Module\Transfer\Enums\TStatus;
-use App\Module\Transfer\Enums\TType;
-use App\Module\Transfer\Model\TransferOrder;
+use App\Module\TransferOld\Enums\TStatus;
+use App\Module\TransferOld\Enums\TType;
+use App\Module\TransferOld\Model\TransferOrder;
 use Carbon\Carbon;
 use Dcore\Exception\LogicException;
 use Dcore\Helper\Logger;

app/Module/TransferOld/AutoCallOut.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Module\Transfer;
+namespace App\Module\TransferOld;
 
 use App\Jobs\TransferOrderOutCallback;
 use App\Module\Outside\Http;
-use App\Module\Transfer\Enums\TStatus;
-use App\Module\Transfer\Enums\TType;
-use App\Module\Transfer\Model\TransferOrder;
+use App\Module\TransferOld\Enums\TStatus;
+use App\Module\TransferOld\Enums\TType;
+use App\Module\TransferOld\Model\TransferOrder;
 use Carbon\Carbon;
 use Dcore\Exception\LogicException;
 use Dcore\Helper\Logger;

app/Module/TransferOld/Enums/TStatus.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Module\Transfer\Enums;
+namespace App\Module\TransferOld\Enums;
 
 use Dcore\Enum\EnumCore;
 use Dcore\Enum\EnumExpression;

app/Module/TransferOld/Enums/TType.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Module\Transfer\Enums;
+namespace App\Module\TransferOld\Enums;
 
 use Dcore\Enum\EnumCore;
 use Dcore\Enum\EnumExpression;

app/Module/TransferOld/Info.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\Transfer;
+namespace App\Module\TransferOld;
 
-use App\Module\Transfer\Model\TransferOrder;
+use App\Module\TransferOld\Model\TransferOrder;
 
 class Info
 {

app/Module/TransferOld/Model/TransferApp.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Module\Transfer\Model;
+namespace App\Module\TransferOld\Model;
 
 use App\Models\ModelCore;
 
 
 /**
  * 划转APP
- * field start 
- * @property   int  $id  
+ * field start
+ * @property   int  $id
  * @property   string  $keyname  标识
  * @property   string  $title  应用名字
  * @property   string  $desc  描述
@@ -23,13 +23,13 @@ use App\Models\ModelCore;
  * @property   string  $order_in_info  入金 - 交易查询
  * @property   string  $order_out_create  出单创建
  * @property   string  $order_out_info  出金 - 交易查询
- * @property   \Carbon\Carbon  $created_at  
- * @property   \Carbon\Carbon  $updated_at  
+ * @property   \Carbon\Carbon  $created_at
+ * @property   \Carbon\Carbon  $updated_at
  * @property   \Carbon\Carbon  $deleted_at  删除时间
  * field end
  *
  */
-class TransferApp extends ModelCore
+class TransferApp extends ModelCore\
 {
 
 }

app/Module/TransferOld/Model/TransferOrder.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace App\Module\Transfer\Model;
+namespace App\Module\TransferOld\Model;
 
 use App\Models\ModelCore;
-use App\Module\Transfer\Enums\TStatus;
-use App\Module\Transfer\Enums\TType;
+use App\Module\TransferOld\Enums\TStatus;
+use App\Module\TransferOld\Enums\TType;
 
 
 /**
  * 划转订单
  *
- * field start 
- * @property   int  $id  
+ * field start
+ * @property   int  $id
  * @property   int  $trapp_id  划转 app_id
  * @property   int  $out_id  对应 外部APP
  * @property   string  $out_order_id  外部 订单ID
@@ -23,8 +23,8 @@ use App\Module\Transfer\Enums\TType;
  * @property   int  $type  类型,方向
  * @property   float  $oamount  外部钱数
  * @property   int  $amount  我们钱数
- * @property   \Carbon\Carbon  $created_at  
- * @property   \Carbon\Carbon  $updated_at  
+ * @property   \Carbon\Carbon  $created_at
+ * @property   \Carbon\Carbon  $updated_at
  * @property   \Carbon\Carbon  $deleted_at  删除时间
  * field end
  *

app/Module/TransferOld/OutBudan.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Module\Transfer;
+namespace App\Module\TransferOld;
 
 use App\Module\Outside\Http;
-use App\Module\Transfer\Enums\TStatus;
-use App\Module\Transfer\Model\TransferOrder;
+use App\Module\TransferOld\Enums\TStatus;
+use App\Module\TransferOld\Model\TransferOrder;
 use Dcore\Helper\Logger;
 
 class OutBudan

app/Module/TransferOld/Repository/App.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Module\Transfer\Repository;
+namespace App\Module\TransferOld\Repository;
 
 use App\Admin\Core\Repositories\EloquentRepository;
 
 class App extends EloquentRepository
 {
 
-    protected $eloquentClass = \App\Module\Transfer\Model\TransferApp::class;
+    protected $eloquentClass = \App\Module\TransferOld\Model\TransferApp::class;
 
 }

app/Module/TransferOld/Repository/Order.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Module\Transfer\Repository;
+namespace App\Module\TransferOld\Repository;
 
 use App\Admin\Core\Repositories\EloquentRepository;
 
 class Order extends EloquentRepository
 {
-    protected $eloquentClass= \App\Module\Transfer\Model\TransferOrder::class;
+    protected $eloquentClass= \App\Module\TransferOld\Model\TransferOrder::class;
 
 }

app/Module/TransferOld/Validation/INCreate.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Module\Transfer\Validation;
+namespace App\Module\TransferOld\Validation;
 
 use App\Module\App\Validation\ValidationCore;
 use App\Module\Outside\Validator\Ouid;
-use App\Module\Transfer\Model\TransferApp;
-use App\Module\Transfer\Validator\BusinessId;
-use App\Module\Transfer\Validator\OutApp;
+use App\Module\TransferOld\Model\TransferApp;
+use App\Module\TransferOld\Validator\BusinessId;
+use App\Module\TransferOld\Validator\OutApp;
 use App\Module\User\Validator\AuthPassword;
 use App\Module\User\Validator\Google2FA;
 use App\Module\User\Validator\UserIdInfo2;

app/Module/TransferOld/Validation/OutCreate.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Module\Transfer\Validation;
+namespace App\Module\TransferOld\Validation;
 
 use App\Module\App\Validation\ValidationCore;
 use App\Module\App\Validator\UserBind2Validator;
 use App\Module\App\Validator\UserBindValidator;
-use App\Module\Transfer\Model\TransferApp;
-use App\Module\Transfer\Validator\TrApp;
-use App\Module\Transfer\Validator\TrOpen;
+use App\Module\TransferOld\Model\TransferApp;
+use App\Module\TransferOld\Validator\TrApp;
+use App\Module\TransferOld\Validator\TrOpen;
 use App\Module\User\Model\UserInfo;
 use App\Module\User\Validation\SPasswordCheck;
 use App\Module\User\Validator\AuthPassword;

app/Module/TransferOld/Validator/BusinessId.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\Transfer\Validator;
+namespace App\Module\TransferOld\Validator;
 
-use App\Module\Transfer\Model\TransferOrder;
+use App\Module\TransferOld\Model\TransferOrder;
 use Dcore\Validator;
 
 /**

app/Module/TransferOld/Validator/OutApp.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\Transfer\Validator;
+namespace App\Module\TransferOld\Validator;
 
-use App\Module\Transfer\Model\TransferApp;
+use App\Module\TransferOld\Model\TransferApp;
 use Dcore\Validator;
 
 class OutApp extends Validator

app/Module/TransferOld/Validator/TrApp.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Module\Transfer\Validator;
+namespace App\Module\TransferOld\Validator;
 
-use App\Module\Transfer\Model\TransferApp;
+use App\Module\TransferOld\Model\TransferApp;
 use Dcore\Validator;
 
 

app/Module/TransferOld/Validator/TrOpen.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Module\Transfer\Validator;
+namespace App\Module\TransferOld\Validator;
 
 use App\Module\Sys\Config;
-use App\Module\Transfer\Model\TransferApp;
+use App\Module\TransferOld\Model\TransferApp;
 use Dcore\Validator;
 
 

database/test/delete.sql

@@ -23,6 +23,7 @@ delete from  kku_urs_promotion_user_referrals where 1=1;
 delete from kku_urs_promotion_user_mappings where 1=1;
 # delete from  kku_urs_promotion_talent_configs 不处理，配置项目
 delete from  kku_urs_promotion_profits where 1=1;
+# delete urs_promotion_transfer_fee_configs 不处理，配置项目
 
 # 划转模块
 delete from  kku_transfer_orders where 1=1;
@@ -124,7 +125,7 @@ delete from kku_item_transaction_logs where 1=1;
 delete from kku_item_pity_times  where user_id > 10000;
 # kku_item_output_limits  不处理，配置项目，物品产出限制配置
 # kku_item_items 不处理，配置项目，物品配置
-# kku_item_instances 不处理，配置项目，物品实例配置
+delete from kku_item_instances  where 1=1;
 # kku_item_groups 不处理，配置项目，物品组配置
 # kku_item_group_items 不处理，配置项目，物品组项目配置
 delete from kku_item_freeze_logs where user_id > 10000;