修复：LayUI独立模式tree一处bug

Author: modstart

module/Member/Admin/Controller/ConfigController.php

@@ -10,7 +10,7 @@
 use ModStart\Form\Form;
 use ModStart\Module\ModuleManager;
 use ModStart\Support\Concern\HasFields;
-use Module\Member\Model\MemberDataStatistic;
+use Module\Member\Util\MemberDataStatisticUtil;
 use Module\Member\Util\MemberParamUtil;
 use Module\Vendor\Provider\Captcha\CaptchaProvider;
 
@@ -182,7 +182,7 @@ public function dataStatistic()
         $memberUserId = $input->getInteger('memberUserId');
         $data = [];
         $data['sizeLimit'] = $input->getInteger('sizeLimit');
-        MemberDataStatistic::updateMemberUser($memberUserId, $data);
+        MemberDataStatisticUtil::updateMemberUser($memberUserId, $data);
         return Response::generateSuccess('保存成功');
     }
 

module/Member/Admin/Controller/MemberController.php

@@ -36,6 +36,7 @@
 use Module\Member\Config\MemberAdminList;
 use Module\Member\Config\MemberOauth;
 use Module\Member\Events\MemberUserRegisteredEvent;
+use Module\Member\Events\MemberUserVipChangeEvent;
 use Module\Member\Provider\MemberAdminShowPanel\MemberAdminShowPanelProvider;
 use Module\Member\Type\Gender;
 use Module\Member\Type\MemberStatus;
@@ -152,7 +153,7 @@ protected function crud(AdminCRUDBuilder $builder)
             ->canShow(false)
             ->canDelete(true)
             ->canEdit(false)
-            ->canExport(ModuleManager::getModuleConfig('Member', 'exportEnable',false));
+            ->canExport(ModuleManager::getModuleConfig('Member', 'exportEnable', false));
     }
 
     public function selectRemote()
@@ -266,6 +267,9 @@ public function edit(AdminDialogPage $page)
             if (isset($profile['vipExpire']) && TimeUtil::isDateEmpty($profile['vipExpire'])) {
                 $profile['vipExpire'] = null;
             }
+            if ($memberUser['vipId'] != $profile['vipId']) {
+                MemberUserVipChangeEvent::fire($memberUser['id'], $memberUser['vipId'], $profile['vipId']);
+            }
             MemberUtil::update($memberUser['id'], $profile);
             return Response::redirect(CRUDUtil::jsDialogCloseAndParentRefresh());
         });

module/Member/Core/MemberDataStatisticAdminShowPanelProvider.php

@@ -6,8 +6,8 @@
 
 use ModStart\Core\Util\FileUtil;
 use ModStart\Form\Form;
-use Module\Member\Model\MemberDataStatistic;
 use Module\Member\Provider\MemberAdminShowPanel\AbstractMemberAdminShowPanelProvider;
+use Module\Member\Util\MemberDataStatisticUtil;
 
 class MemberDataStatisticAdminShowPanelProvider extends AbstractMemberAdminShowPanelProvider
 {
@@ -25,7 +25,7 @@ public function title()
 
     public function render($memberUser, $param = [])
     {
-        $record = MemberDataStatistic::getCreateMemberUser($memberUser['id']);
+        $record = MemberDataStatisticUtil::getCreateMemberUser($memberUser['id']);
         $form = Form::make('');
         $form->number('sizeLimit', '大小限制')->help('单位MB');
         $form->display('sizeUsed', '已使用大小')->addable(true);

module/Member/Core/MemberVipPayCenterBiz.php

@@ -4,12 +4,11 @@
 namespace Module\Member\Core;
 
 
-use Illuminate\Support\Facades\Log;
 use ModStart\Core\Dao\ModelUtil;
 use ModStart\Core\Exception\BizException;
 use ModStart\Core\Input\Response;
 use ModStart\Module\ModuleManager;
-use Module\Member\Api\Controller\MemberVipController;
+use Module\Member\Events\MemberUserVipChangeEvent;
 use Module\Member\Util\MemberCreditUtil;
 use Module\Member\Util\MemberUtil;
 use Module\Member\Util\MemberVipUtil;
@@ -37,6 +36,10 @@ public function onPayed($payBizId, $payOrder, $param = [])
             return;
         }
         ModelUtil::update('member_vip_order', ['id' => $payBizId], ['status' => OrderStatus::COMPLETED]);
+        $memberUser = MemberUtil::get($order['memberUserId']);
+        if (empty($memberUser)) {
+            return;
+        }
         $update = [];
         $update['vipId'] = $order['vipId'];
         $update['vipExpire'] = $order['expire'];
@@ -47,6 +50,9 @@ public function onPayed($payBizId, $payOrder, $param = [])
                 MemberCreditUtil::change($order['memberUserId'], $vipSet['creditPresentValue'], '会员VIP赠送积分');
             }
         }
+        if ($update['vipId'] != $memberUser['vipId']) {
+            MemberUserVipChangeEvent::fire($order['memberUserId'], $memberUser['vipId'], $update['vipId']);
+        }
     }
 
     public function createOrderForQuick($quickOrder, $param = [])

module/Member/Core/ModuleServiceProvider.php

@@ -18,7 +18,6 @@
 use Module\Member\Config\MemberHomeIcon;
 use Module\Member\Config\MemberMenu;
 use Module\Member\Events\MemberUserRegisteredEvent;
-use Module\Member\Model\MemberDataStatistic;
 use Module\Member\Model\MemberUpload;
 use Module\Member\Provider\MemberAdminShowPanel\MemberAdminShowPanelProvider;
 use Module\Member\Provider\MemberDeleteScheduleProvider;
@@ -186,19 +185,18 @@ public function boot(Dispatcher $events)
             }
             if (class_exists(DataUploadedEvent::class)) {
                 DataUploadedEvent::listen('member_upload', function (DataUploadedEvent $e) {
-                    MemberDataStatistic::updateMemberUserUsedSize($e->userId);
+                    MemberDataStatisticUtil::updateMemberUserUsedSize($e->userId);
+                });
+            }
+            if (class_exists(DataDeletedEvent::class)) {
+                DataDeletedEvent::listen(function (DataDeletedEvent $e) {
+                    $record = MemberUpload::where(['dataId' => $e->data['id']])->first();
+                    if ($record) {
+                        $record->delete();
+                        MemberDataStatisticUtil::updateMemberUserUsedSize($record->userId);
+                    }
                 });
             }
-        }
-
-        if (class_exists(DataDeletedEvent::class)) {
-            DataDeletedEvent::listen(function (DataDeletedEvent $e) {
-                $record = MemberUpload::where(['dataId' => $e->data['id']])->first();
-                if ($record) {
-                    $record->delete();
-                    MemberDataStatistic::updateMemberUserUsedSize($record->userId);
-                }
-            });
         }
 
         Event::listen(MemberUserRegisteredEvent::class, function (MemberUserRegisteredEvent $e) {

module/Member/Docs/release.md

@@ -1,6 +1,7 @@
 ## 4.1.0
 
 - 新增：短信验证注册时可支持同时设置登录密码
+- 新增：用户文件上传增加type字段，区分文件类型
 - 优化：用户管理后台用户注册登录设置页面文案优化
 - 优化：用户VIP页面条目是否可视移动端接口优化
 - 修复：用户积分记录更新异常问题修复

module/Member/Events/MemberUserVipChangeEvent.php

@@ -0,0 +1,23 @@
+<?php
+
+
+namespace Module\Member\Events;
+
+
+use ModStart\Core\Util\EventUtil;
+
+class MemberUserVipChangeEvent
+{
+    public $memberUserId;
+    public $fromVipId;
+    public $toVipId;
+
+    public static function fire($memberUserId, $fromVipId, $toVipId)
+    {
+        $event = new static();
+        $event->memberUserId = $memberUserId;
+        $event->fromVipId = $fromVipId;
+        $event->toVipId = $toVipId;
+        EventUtil::fire($event);
+    }
+}

module/Member/Migrate/2023_12_10_000000_member_upload_type.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MemberUploadType extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('member_upload', function (Blueprint $table) {
+            /** @see \ModStart\Admin\Type\UploadType */
+            $table->tinyInteger('type')->nullable()->comment('类型');
+        });
+        \ModStart\Core\Dao\ModelUtil::updateAll('member_upload', [
+            'type' => \ModStart\Admin\Type\UploadType::USER
+        ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+}

module/Member/Model/MemberDataStatistic.php

@@ -10,6 +10,11 @@ class MemberDataStatistic extends Model
 {
     protected $table = 'member_data_statistic';
 
+    /**
+     * @param $id
+     * @return mixed
+     * @deprecated delete at 2024-06-10
+     */
     public static function getCreateMemberUser($id)
     {
         $first = self::where('id', $id)->first();
@@ -24,6 +29,11 @@ public static function getCreateMemberUser($id)
         return $first->toArray();
     }
 
+    /**
+     * @param $id
+     * @param $data
+     * @deprecated delete at 2024-06-10
+     */
     public static function updateMemberUser($id, $data)
     {
         $m = self::where('id', $id)->first();
@@ -42,6 +52,11 @@ public static function updateMemberUser($id, $data)
         }
     }
 
+    /**
+     * @param $id
+     * @return int
+     * @deprecated delete at 2024-06-10
+     */
     public static function calcMemberUserUsedSize($id)
     {
         $total = MemberUpload::where(['userId' => $id])
@@ -50,6 +65,10 @@ public static function calcMemberUserUsedSize($id)
         return intval($total);
     }
 
+    /**
+     * @param $id
+     * @deprecated delete at 2024-06-10
+     */
     public static function updateMemberUserUsedSize($id)
     {
         $update = [

module/Member/Util/MemberDataStatisticUtil.php

@@ -8,6 +8,7 @@
 use ModStart\Core\Util\FileUtil;
 use ModStart\Module\ModuleManager;
 use Module\Member\Model\MemberDataStatistic;
+use Module\Member\Model\MemberUpload;
 
 class MemberDataStatisticUtil
 {
@@ -30,4 +31,52 @@ public static function checkQuota($memberUserId)
             BizException::throws('您的上传空间已满，最多可以上传' . FileUtil::formatByte($sizeLimitBytes));
         }
     }
+
+    public static function getCreateMemberUser($id)
+    {
+        $first = MemberDataStatistic::where('id', $id)->first();
+        if (empty($first)) {
+            $m = new self();
+            $m->id = $id;
+            $m->sizeLimit = modstart_config('Member_DataStatisticDefaultLimit', 1024);
+            $m->save();
+            self::updateMemberUserUsedSize($id);
+            return self::getCreateMemberUser($id);
+        }
+        return $first->toArray();
+    }
+
+    public static function updateMemberUser($id, $data)
+    {
+        $m = MemberDataStatistic::where('id', $id)->first();
+        $updateSize = false;
+        if (empty($m)) {
+            $m = new self();
+            $m->id = $id;
+            $updateSize = true;
+        }
+        foreach ($data as $k => $v) {
+            $m->$k = $v;
+        }
+        $m->save();
+        if ($updateSize) {
+            self::updateMemberUserUsedSize($id);
+        }
+    }
+
+    public static function calcMemberUserUsedSize($id)
+    {
+        $total = MemberUpload::where(['userId' => $id])
+            ->leftJoin('data', 'data.id', '=', 'member_upload.dataId')
+            ->sum('data.size');
+        return intval($total);
+    }
+
+    public static function updateMemberUserUsedSize($id)
+    {
+        $update = [
+            'sizeUsed' => self::calcMemberUserUsedSize($id),
+        ];
+        MemberDataStatistic::where('id', $id)->update($update);
+    }
 }