Ver código fonte

Merge branch 'feature-wechat' of 121.36.198.49:zy_duanju/duanju_manage into feature-wechat

zhaoyang 1 ano atrás
pai
commit
804993bb76
100 arquivos alterados com 22 adições e 11 exclusões
  1. 0 0
      .editorconfig
  2. 0 0
      .env.example
  3. 0 0
      .gitattributes
  4. 0 0
      .gitignore
  5. 0 0
      .php-cs-fixer.dist.php
  6. 0 0
      .prettierrc
  7. 0 0
      LICENSE.txt
  8. 0 0
      README.md
  9. 0 0
      app/Console/Commands/Callback/JuliangAccountRateConfigRefresh.php
  10. 20 10
      app/Console/Commands/ContentManage/ContentTest.php
  11. 0 0
      app/Console/Commands/ContentManage/CpSubscribeMonthStatisticData.php
  12. 0 0
      app/Console/Commands/ContentManage/SaveBookSettlementMode.php
  13. 0 0
      app/Console/Commands/ContentManage/SyncCpSubscribeStatisticDataFromZW.php
  14. 0 0
      app/Console/Commands/Jiesuan/CompanyChargeDayJiesuan.php
  15. 0 0
      app/Console/Commands/Statistic/CompanyDayCharge.php
  16. 0 0
      app/Console/Commands/Statistic/CompanyDayUserStatistic.php
  17. 0 0
      app/Console/Commands/Statistic/CompanyMonthCharge.php
  18. 0 0
      app/Console/Commands/Statistic/OptimizerDayUserStatistic.php
  19. 0 0
      app/Console/Commands/Statistic/OptimizerMonthCharge.php
  20. 0 0
      app/Console/Commands/Statistic/PromotionDayCharge.php
  21. 0 0
      app/Console/Kernel.php
  22. 0 0
      app/Events/Create.php
  23. 0 0
      app/Events/Test.php
  24. 0 0
      app/Exceptions/Handler.php
  25. 0 0
      app/Http/Controllers/Controller.php
  26. 0 0
      app/Http/Kernel.php
  27. 0 0
      app/Http/Middleware/Authenticate.php
  28. 0 0
      app/Http/Middleware/EncryptCookies.php
  29. 0 0
      app/Http/Middleware/PreventRequestsDuringMaintenance.php
  30. 0 0
      app/Http/Middleware/RedirectIfAuthenticated.php
  31. 0 0
      app/Http/Middleware/TrimStrings.php
  32. 0 0
      app/Http/Middleware/TrustHosts.php
  33. 0 0
      app/Http/Middleware/TrustProxies.php
  34. 0 0
      app/Http/Middleware/ValidateSignature.php
  35. 0 0
      app/Http/Middleware/VerifyCsrfToken.php
  36. 0 0
      app/Jobs/Video/WechatCheck.php
  37. 0 0
      app/Libs/Helpers.php
  38. 0 0
      app/Libs/HuaweiObsSdk/Help on License
  39. 0 0
      app/Libs/HuaweiObsSdk/LICENSE
  40. 0 0
      app/Libs/HuaweiObsSdk/Notice.MD
  41. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/CheckoutStream.php
  42. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/ITransform.php
  43. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/Model.php
  44. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/ObsTransform.php
  45. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/SchemaFormatter.php
  46. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/SdkCurlFactory.php
  47. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/SdkStreamHandler.php
  48. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/ToArrayInterface.php
  49. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Common/V2Transform.php
  50. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/GetResponseTrait.php
  51. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Resource/Constants.php
  52. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Resource/OBSConstants.php
  53. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Resource/OBSRequestResource.php
  54. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Resource/V2Constants.php
  55. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Resource/V2RequestResource.php
  56. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/SendRequestTrait.php
  57. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Signature/AbstractSignature.php
  58. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Signature/DefaultSignature.php
  59. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Signature/SignatureInterface.php
  60. 0 0
      app/Libs/HuaweiObsSdk/Obs/Internal/Signature/V4Signature.php
  61. 0 0
      app/Libs/HuaweiObsSdk/Obs/Log/ObsConfig.php
  62. 0 0
      app/Libs/HuaweiObsSdk/Obs/Log/ObsLog.php
  63. 0 0
      app/Libs/HuaweiObsSdk/Obs/ObsClient.php
  64. 0 0
      app/Libs/HuaweiObsSdk/Obs/ObsException.php
  65. 0 0
      app/Libs/HuaweiObsSdk/README.md
  66. 0 0
      app/Libs/HuaweiObsSdk/composer.json
  67. 0 0
      app/Libs/HuaweiObsSdk/examples/BucketOperationsSample.php
  68. 0 0
      app/Libs/HuaweiObsSdk/examples/ConcurrentCopyPartSample.php
  69. 0 0
      app/Libs/HuaweiObsSdk/examples/ConcurrentDownloadObjectSample.php
  70. 0 0
      app/Libs/HuaweiObsSdk/examples/ConcurrentUploadPartSample.php
  71. 0 0
      app/Libs/HuaweiObsSdk/examples/CreateFolderSample.php
  72. 0 0
      app/Libs/HuaweiObsSdk/examples/DeleteObjectsSample.php
  73. 0 0
      app/Libs/HuaweiObsSdk/examples/DownloadSample.php
  74. 0 0
      app/Libs/HuaweiObsSdk/examples/ListObjectsInFolderSample.php
  75. 0 0
      app/Libs/HuaweiObsSdk/examples/ListObjectsSample.php
  76. 0 0
      app/Libs/HuaweiObsSdk/examples/ListVersionsSample.php
  77. 0 0
      app/Libs/HuaweiObsSdk/examples/ObjectMetaSample.php
  78. 0 0
      app/Libs/HuaweiObsSdk/examples/ObjectOperationsSample.php
  79. 0 0
      app/Libs/HuaweiObsSdk/examples/ObsPhpDemo.php
  80. 0 0
      app/Libs/HuaweiObsSdk/examples/PostObjectSample.php
  81. 0 0
      app/Libs/HuaweiObsSdk/examples/RestoreObjectSample.php
  82. 0 0
      app/Libs/HuaweiObsSdk/examples/SimpleMultipartUploadSample.php
  83. 0 0
      app/Libs/HuaweiObsSdk/examples/TemporarySignatureSample.php
  84. 0 0
      app/Libs/HuaweiObsSdk/obs-autoloader.php
  85. 0 0
      app/Libs/Pay/Palmpay.php
  86. 0 0
      app/Libs/Pay/PayMerchantInterface.php
  87. 0 0
      app/Listeners/Command.php
  88. 0 0
      app/Listeners/RouteMatched.php
  89. 0 0
      app/Listeners/test.php
  90. 0 0
      app/Models/Modules/Users/Models/CatchController.php
  91. 0 0
      app/Models/User.php
  92. 2 1
      app/Providers/AppServiceProvider.php
  93. 0 0
      app/Providers/AuthServiceProvider.php
  94. 0 0
      app/Providers/BroadcastServiceProvider.php
  95. 0 0
      app/Providers/EventServiceProvider.php
  96. 0 0
      app/Providers/RouteServiceProvider.php
  97. 0 0
      artisan
  98. 0 0
      blaze/config/blaze.php
  99. 0 0
      blaze/resources/views/components/navigate.blade.php
  100. 0 0
      blaze/resources/views/components/paginate.blade.php

+ 0 - 0
.editorconfig


+ 0 - 0
.env.example


+ 0 - 0
.gitattributes


+ 0 - 0
.gitignore


+ 0 - 0
.php-cs-fixer.dist.php


+ 0 - 0
.prettierrc


+ 0 - 0
LICENSE.txt


+ 0 - 0
README.md


+ 0 - 0
app/Console/Commands/Callback/JuliangAccountRateConfigRefresh.php


+ 20 - 10
app/Console/Commands/ContentManage/ContentTest.php

@@ -6,6 +6,7 @@ use http\Exception\RuntimeException;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Redis;
+use Modules\Audience\Services\UserGroupService;
 use Modules\Common\Errors\Errors;
 use Modules\Common\Exceptions\CommonBusinessException;
 
@@ -30,15 +31,24 @@ class ContentTest extends Command
      */
     public function handle(): void
     {
-       $result = DB::table('promotions')
-           ->where(['puid' => 0])
-           ->get();
-       foreach ($result as $item) {
-           DB::table('promotions')
-               ->where('id', $item->id)
-               ->update([
-                   'puid' => DB::table('users')->where('id', $item->uid)->value('pid')
-               ]);
-       }
+        $tags = [
+            'attention_hour' => '0-6',
+            'in_48_hour' => 1,
+            'interact_hour' => '0-6',
+            'last_watch_day' => '0-2',
+            'register_day' => '0-2',
+            'total_watch_day' => '0-2',
+            'charge_type' => 1,
+            'total_charge_money' => '1-1000',
+            'avg_charge_money' => '2-300',
+            'charge_num' => '1-1',
+            'remain_coin' => '0-1',
+            'last_charge_day' => '0-4',
+            'video_watch' => [1,2,3],
+            'video_charge' => [4,5]
+        ];
+
+        $sql = UserGroupService::getSQL($tags)->distinct()->count('a.uid');
+        dump($sql);
     }
 }

+ 0 - 0
app/Console/Commands/ContentManage/CpSubscribeMonthStatisticData.php


+ 0 - 0
app/Console/Commands/ContentManage/SaveBookSettlementMode.php


+ 0 - 0
app/Console/Commands/ContentManage/SyncCpSubscribeStatisticDataFromZW.php


+ 0 - 0
app/Console/Commands/Jiesuan/CompanyChargeDayJiesuan.php


+ 0 - 0
app/Console/Commands/Statistic/CompanyDayCharge.php


+ 0 - 0
app/Console/Commands/Statistic/CompanyDayUserStatistic.php


+ 0 - 0
app/Console/Commands/Statistic/CompanyMonthCharge.php


+ 0 - 0
app/Console/Commands/Statistic/OptimizerDayUserStatistic.php


+ 0 - 0
app/Console/Commands/Statistic/OptimizerMonthCharge.php


+ 0 - 0
app/Console/Commands/Statistic/PromotionDayCharge.php


+ 0 - 0
app/Console/Kernel.php


+ 0 - 0
app/Events/Create.php


+ 0 - 0
app/Events/Test.php


+ 0 - 0
app/Exceptions/Handler.php


+ 0 - 0
app/Http/Controllers/Controller.php


+ 0 - 0
app/Http/Kernel.php


+ 0 - 0
app/Http/Middleware/Authenticate.php


+ 0 - 0
app/Http/Middleware/EncryptCookies.php


+ 0 - 0
app/Http/Middleware/PreventRequestsDuringMaintenance.php


+ 0 - 0
app/Http/Middleware/RedirectIfAuthenticated.php


+ 0 - 0
app/Http/Middleware/TrimStrings.php


+ 0 - 0
app/Http/Middleware/TrustHosts.php


+ 0 - 0
app/Http/Middleware/TrustProxies.php


+ 0 - 0
app/Http/Middleware/ValidateSignature.php


+ 0 - 0
app/Http/Middleware/VerifyCsrfToken.php


+ 0 - 0
app/Jobs/Video/WechatCheck.php


+ 0 - 0
app/Libs/Helpers.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Help on License


+ 0 - 0
app/Libs/HuaweiObsSdk/LICENSE


+ 0 - 0
app/Libs/HuaweiObsSdk/Notice.MD


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/CheckoutStream.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/ITransform.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/Model.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/ObsTransform.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/SchemaFormatter.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/SdkCurlFactory.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/SdkStreamHandler.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/ToArrayInterface.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Common/V2Transform.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/GetResponseTrait.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Resource/Constants.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Resource/OBSConstants.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Resource/OBSRequestResource.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Resource/V2Constants.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Resource/V2RequestResource.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/SendRequestTrait.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Signature/AbstractSignature.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Signature/DefaultSignature.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Signature/SignatureInterface.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Internal/Signature/V4Signature.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Log/ObsConfig.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/Log/ObsLog.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/ObsClient.php


+ 0 - 0
app/Libs/HuaweiObsSdk/Obs/ObsException.php


+ 0 - 0
app/Libs/HuaweiObsSdk/README.md


+ 0 - 0
app/Libs/HuaweiObsSdk/composer.json


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/BucketOperationsSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ConcurrentCopyPartSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ConcurrentDownloadObjectSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ConcurrentUploadPartSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/CreateFolderSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/DeleteObjectsSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/DownloadSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ListObjectsInFolderSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ListObjectsSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ListVersionsSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ObjectMetaSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ObjectOperationsSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/ObsPhpDemo.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/PostObjectSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/RestoreObjectSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/SimpleMultipartUploadSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/examples/TemporarySignatureSample.php


+ 0 - 0
app/Libs/HuaweiObsSdk/obs-autoloader.php


+ 0 - 0
app/Libs/Pay/Palmpay.php


+ 0 - 0
app/Libs/Pay/PayMerchantInterface.php


+ 0 - 0
app/Listeners/Command.php


+ 0 - 0
app/Listeners/RouteMatched.php


+ 0 - 0
app/Listeners/test.php


+ 0 - 0
app/Models/Modules/Users/Models/CatchController.php


+ 0 - 0
app/Models/User.php


+ 2 - 1
app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+
     }
 }

+ 0 - 0
app/Providers/AuthServiceProvider.php


+ 0 - 0
app/Providers/BroadcastServiceProvider.php


+ 0 - 0
app/Providers/EventServiceProvider.php


+ 0 - 0
app/Providers/RouteServiceProvider.php


+ 0 - 0
artisan


+ 0 - 0
blaze/config/blaze.php


+ 0 - 0
blaze/resources/views/components/navigate.blade.php


+ 0 - 0
blaze/resources/views/components/paginate.blade.php


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff