fix(share,agent): 优化分享页路径匹配及代理商分佣逻辑

.gitignore

@@ -13,3 +13,4 @@ composer.lock
 /public/uploads
 
 .codebuddy/memory/2025-07-07.md
+.codebuddy/memory/2026-07-08.md

application/admin/model/shopro/Share.php

@@ -90,25 +90,28 @@ class Share extends Common
         }
         // custom_log('[share.log] 重复检查通过', $userId, 'share');
 
-        $memoText = '通过' . (self::FROM)[$params['from']] . '访问了';
-        if ($params['page'] == '/pages/index/index') {
+        $memoText = '通过' . (self::FROM)[$params['from']] . '访问了-';
+        if (trim($params['page'], '\\/') == '/pages/index/index') {
             $memoText .= '首页';
         }
-        if ($params['page'] === '/pages/goods/index') {
+        if (trim($params['page'], '\\/') === 'pages\/goods\/index') {
             $memoText .= '商品';
             $goodsId = $params['query']['id'];
         }
-        if ($params['page'] === '/pages/goods/groupon') {
+        if (trim($params['page'], '\\/') === 'pages\/goods\/groupon') {
             $memoText .= '拼团商品';
             $goodsId = $params['query']['id'];
         }
-        if ($params['page'] === '/pages/goods/seckill') {
+        if (trim($params['page'], '\\/') === 'pages\/goods\/seckill') {
             $memoText .= '秒杀商品';
             $goodsId = $params['query']['id'];
         }
-        if ($params['page'] === '/pages/activity/groupon/detail') {
+        if (trim($params['page'], '\\/') === 'pages\/activity\/groupon\/detail') {
             $memoText .= '拼团活动';
         }
+        if (trim($params['page'], '\\/') === 'pages\/index\/aiGenerated') {
+            $memoText .= 'AI试戴详情';
+        }
 
         if (!empty($goodsId)) {
             $goods = GoodsModel::find($goodsId);

application/command/AgentOrderCommission.php

@@ -267,8 +267,8 @@ class AgentOrderCommission extends Command
         // 获取订单商品信息
         $orderItems = $this->getOrderItems($orderId);
 
-        // 查找两级代理商
-        $agents = $this->findAgentChain($buyerUserId, 2);
+        // 查找两级代理商,确保代理商申请成功后的订单才分佣
+        $agents = $this->findAgentChain($buyerUserId, $order['createtime'], 2);
 
         if (empty($agents)) {
             $this->customLog('info', "订单[{$orderSn}]跳过: 未找到有效的上级代理商, 买家[{$buyerUserId}]");
@@ -284,19 +284,19 @@ class AgentOrderCommission extends Command
             // 从 fa_shopro_agent 表获取该代理商的佣金比例及记录ID
             $agentRecord = Db::name('shopro_agent')
                 ->where('user_id', $agentUserId)
-                ->field('id, user_id, commission_rate')
+                ->field('id, user_id, commission_rate, createtime')
                 ->find();
 
+            $recordAgentId = $agentRecord['id'];
+            $commissionRate = floatval($agentRecord['commission_rate']);
+
             if (!$agentRecord) {
-                $this->customLog('warning', "订单[{$orderSn}]代理商user_id[{$agentUserId}]在shopro_agent表中不存在, 跳过");
+                $this->customLog('warning', "订单[{$orderSn}]代理商[{$recordAgentId}}]用户[{$agentUserId}]在shopro_agent表中不存在, 跳过");
                 continue;
             }
 
-            $recordAgentId = $agentRecord['id'];
-            $commissionRate = floatval($agentRecord['commission_rate']);
-
             if ($commissionRate <= 0) {
-                $this->customLog('warning', "订单[{$orderSn}]代理商[{$recordAgentId}]commission_rate为0或未设置, 跳过");
+                $this->customLog('warning', "订单[{$orderSn}]代理商[{$recordAgentId}]用户[{$agentUserId}]commission_rate为0或未设置, 跳过");
                 continue;
             }
 
@@ -304,7 +304,7 @@ class AgentOrderCommission extends Command
             $commissionAmount = round($payFee * ($commissionRate / 100), 2);
 
             if ($commissionAmount <= 0) {
-                $this->customLog('warning', "订单[{$orderSn}]代理商[{$recordAgentId}]计算佣金为0, 跳过");
+                $this->customLog('warning', "订单[{$orderSn}]代理商[{$recordAgentId}]用户[{$agentUserId}]计算佣金为0, 跳过");
                 continue;
             }
 
@@ -324,9 +324,9 @@ class AgentOrderCommission extends Command
                 'buyer_user_id'           => $buyerUserId,
                 'receive_province_id'     => $provinceInfo['province_id'] ?? 0,
                 'receive_province_name'   => $provinceInfo['province_name'] ?? '',
-                'goods_id'               => $goodsInfo['goods_id'] ?? 0,
-                'goods_title'            => $goodsInfo['goods_title'] ?? '',
-                'goods_pay_price'        => $goodsPayPrice,
+                // 'goods_id'               => $goodsInfo['goods_id'] ?? 0,
+                // 'goods_title'            => $goodsInfo['goods_title'] ?? '',
+                // 'goods_pay_price'        => $goodsPayPrice,
                 'commission_rate_snapshot' => $commissionRate,
                 'commission_amount'       => $commissionAmount,
                 'order_status'           => 'completed',
@@ -346,13 +346,12 @@ class AgentOrderCommission extends Command
                 $exists = Db::name('shopro_agent_order_commission')
                     ->where('order_id', $orderId)
                     ->where('agent_id', $recordAgentId)
-                    ->where('status', 'in', [0, 1])
                     ->lock(true)  // 行级锁，进一步阻止并发
                     ->find();
 
                 if ($exists) {
                     Db::rollback();
-                    $this->customLog('info', "订单[{$orderSn}]代理商[{$recordAgentId}]第{$agentLevel}级已存在佣金记录(事务内), 跳过");
+                    $this->customLog('info', "订单[{$orderSn}]代理商[{$recordAgentId}]用户[{$agentUserId}]第{$agentLevel}级已存在佣金记录(事务内), 跳过");
                     continue;
                 }
 
@@ -364,7 +363,7 @@ class AgentOrderCommission extends Command
                 Db::rollback();
                 // 捕获唯一索引冲突（如有索引），说明真的重复了
                 if (stripos($e->getMessage(), 'Duplicate entry') !== false) {
-                    $this->customLog('info', "订单[{$orderSn}]代理商[{$recordAgentId}]唯一索引冲突，已存在记录, 跳过");
+                    $this->customLog('info', "订单[{$orderSn}]代理商[{$recordAgentId}]用户[{$agentUserId}]唯一索引冲突，已存在记录, 跳过");
                 } else {
                     $this->customLog('error', "订单[{$orderSn}]写入异常: " . $e->getMessage());
                 }
@@ -376,7 +375,7 @@ class AgentOrderCommission extends Command
             }
 
             if ($inserted) {
-                $this->customLog('info', "订单[{$orderSn}]第{$agentLevel}级代理商[{$recordAgentId}]佣金: ¥{$commissionAmount} (订单金额: ¥{$payFee})");
+                $this->customLog('info', "订单[{$orderSn}]第{$agentLevel}级代理商[{$recordAgentId}]用户[{$agentUserId}]佣金: ¥{$commissionAmount} (订单金额: ¥{$payFee})");
                 $this->affectedAgentIds[$recordAgentId] = true;
                 $processedCount++;
             }
@@ -406,10 +405,11 @@ class AgentOrderCommission extends Command
      * 最多向上追溯两级。仅收集状态为 normal 或 freeze 的代理商。
      *
      * @param int $buyerUserId 买家用户ID
+     * @param int $order_create_time 订单创建时间（时间戳）
      * @param int $maxLevel 最大追溯层级（默认2级）
      * @return array [['user_id' => xxx, 'level' => 1], ...]
      */
-    protected function findAgentChain($buyerUserId, $maxLevel = 2)
+    protected function findAgentChain($buyerUserId, int $order_create_time, $maxLevel = 2)
     {
         $agents = [];
         $currentUserId = $buyerUserId;
@@ -428,9 +428,10 @@ class AgentOrderCommission extends Command
 
             $parentUserId = $user['parent_user_id'];
 
-            // 检查上级是否为有效代理商
-            $agent = Db::name('shopro_commission_agent')
+            // 检查上级是否为有效代理商,确保代理商申请成功后的订单才分佣
+            $agent = Db::name('shopro_agent')
                 ->where('user_id', $parentUserId)
+                ->where('createtime', '>', $order_create_time)
                 ->where('status', 'in', ['normal', 'freeze'])
                 ->field('user_id, level')
                 ->find();