From e884f8bfd58b31c8181349a3e872b136e1c0e912 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 5 Dec 2023 10:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E5=AD=98=E5=9C=A8=E6=96=87=E5=88=9B?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=20=E4=BD=86=E6=98=AF=E6=96=87=E5=88=9B?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=E6=9C=AA=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98(=E5=B7=B2=E6=8F=90=E4=BA=A4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/models/TeamDividendAgencyModel.php    | 12 +++++++
 .../src/admin/IndexController.php             | 36 +++++++++++++++++++
 .../weight-value/src/models/WeightValue.php   |  2 +-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/plugins/team-dividend/src/models/TeamDividendAgencyModel.php b/plugins/team-dividend/src/models/TeamDividendAgencyModel.php
index fda8b4e0..66c3cde4 100644
--- a/plugins/team-dividend/src/models/TeamDividendAgencyModel.php
+++ b/plugins/team-dividend/src/models/TeamDividendAgencyModel.php
@@ -358,6 +358,18 @@ class TeamDividendAgencyModel extends BackendModel
                 $o_level = NULL;
                 // 升级日志
                 Uplog::addLog($agency_model, $o_level, $c_level);
+
+
+                if((int)$agentData['cultural_level_id'] > 0){
+                    // 升级后等级
+                    $c_c_level = TeamDividendLevelModel::with(['hasOneUpgradeSet'])->find((int)$agentData['cultural_level_id']);
+                    // 升级前等级
+                    $o_c_level = NULL;
+                    // 升级日志
+                    Uplog::addLog($agency_model, $o_c_level, $c_c_level);
+                }
+
+
                 //签合同
                 $data=[
                     'member_id'=>$agentData['uid'],
diff --git a/plugins/weight-value/src/admin/IndexController.php b/plugins/weight-value/src/admin/IndexController.php
index 0a7caa4a..19c42dfb 100644
--- a/plugins/weight-value/src/admin/IndexController.php
+++ b/plugins/weight-value/src/admin/IndexController.php
@@ -6,6 +6,7 @@ use app\common\helpers\PaginationHelper;
 use app\common\models\Order;
 use Illuminate\Support\Facades\DB;
 use Yunshop\NewPoster\models\Poster;
+use Yunshop\TeamDividend\models\TeamDividendAgencyModel;
 use Yunshop\TeamDividend\models\TeamDividendLevelModel;
 use Yunshop\TeamDividend\models\Uplog;
 use Yunshop\WeightValue\models\WeightValue;
@@ -145,6 +146,41 @@ class IndexController extends BaseController{
         // (new \Yunshop\ShareholderDividend\services\TimedTaskService)->handle();
         // debug($hasNum);
         // (new WeightValue())->areaGiveInit(5,Order::find(161));
+
+
+    /*    $teamList = TeamDividendAgencyModel::uniacid()
+            ->select(['id','uid','cultural_level_id'])
+            ->where('cultural_level_id','>',0)
+            // ->where('uid',182)
+            ->get()
+            ->toArray();
+
+        $notLogList = Uplog::uniacid()
+            ->select(['id','uid','after_level_id'])
+            ->whereIn('uid',array_column($teamList,'uid'))
+            ->whereIn('after_level_id',array_column($teamList,'cultural_level_id'))
+            ->get()
+            ->toArray();
+        $hasUid = array_column($notLogList,'uid');
+
+        // debug([$notLogList,$teamList]);
+        foreach($teamList as $item){
+            if(!in_array($item['uid'],$hasUid)){
+                // 升级后等级
+                $c_c_level = TeamDividendLevelModel::with(['hasOneUpgradeSet'])->find((int)$item['cultural_level_id']);
+                // 升级前等级
+                $o_c_level = NULL;
+                // 升级日志
+
+
+                // debug($item);
+                Uplog::addLog(TeamDividendAgencyModel::find((int)$item['id']), $o_c_level, $c_c_level);
+            }
+        }*/
+
+
+
+
         debug("调试中...");
     }
 
diff --git a/plugins/weight-value/src/models/WeightValue.php b/plugins/weight-value/src/models/WeightValue.php
index 79808ea8..eb7a6271 100644
--- a/plugins/weight-value/src/models/WeightValue.php
+++ b/plugins/weight-value/src/models/WeightValue.php
@@ -326,7 +326,7 @@ class WeightValue extends BaseModel{
                     'change_quantity'               => $weightValue,// 变更数量
                     'change_front'                  => (float)$currentAgentHasWeightValue,// 变更前拥有的数量
                     'change_after'                  => $changeAfter,// 变更后拥有的数量
-                    'remark'                        => "经销商升级赠送",// 备注
+                    'remark'                        => "升级赠送",// 备注
                     'created_at'                    => time(),// 变更时间
                     'source'                        => 1
                 ];