修复(收益): 纠正累计收益统计口径为真实分成收益，排除dmepa与兑换券释放干扰

addons/shopro/controller/commission/Agent.php

@@ -402,12 +402,15 @@ class Agent extends Commission
 
         // 2. 团队成员为目标用户贡献的累计收益与本月收益
         $monthStart = strtotime(date('Y-m-01 00:00:00'));
+        $cashTypes = \addons\shopro\service\partner\PartnerConfig::cashTypes();
         $teamTotalReward = RewardModel::where('user_id', $targetUserId)
             ->whereIn('buyer_id', $teamUserIds)
+            ->whereIn('reward_type', $cashTypes)
             ->where('status', 1)
             ->sum('amount');
         $teamMonthReward = RewardModel::where('user_id', $targetUserId)
             ->whereIn('buyer_id', $teamUserIds)
+            ->whereIn('reward_type', $cashTypes)
             ->where('status', 1)
             ->where('createtime', '>=', $monthStart)
             ->sum('amount');

addons/shopro/controller/user/User.php

@@ -85,7 +85,9 @@ class User extends Common
         $agent = \addons\shopro\service\partner\IdentityService::findAgent($user->id);
         $partner = \addons\shopro\service\partner\IdentityService::attachProfile($agent, null, $user);
         if (empty($partner['total_income']) || $partner['total_income'] === '0.00') {
+            $cashTypes = \addons\shopro\service\partner\PartnerConfig::cashTypes();
             $userRewardCash = \app\admin\model\shopro\partner\Reward::where('user_id', $user->id)
+                ->whereIn('reward_type', $cashTypes)
                 ->where('status', 1)
                 ->where('amount', '>', 0)
                 ->sum('amount');