feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐

application/admin/model/shopro/app/ScoreSkuPrice.php

@@ -55,11 +55,11 @@ class ScoreSkuPrice extends Common
         $priceNum = floatval($price);
 
         if ($priceNum > 0 && $score > 0) {
-            return '￥' . $price . '兑换券 + ' . $score . '积分';
+            return $price . ' 个兑换券 + ' . $score . ' 积分';
         } elseif ($priceNum > 0) {
-            return '￥' . $price . ' 兑换券';
+            return $price . ' 个兑换券';
         } elseif ($score > 0) {
-            return $score . '积分';
+            return $score . ' 积分';
         }
 
         return '免费兑换';

application/admin/model/shopro/partner/Reward.php

@@ -22,6 +22,8 @@ class Reward extends Common
         'skip_reason',
         'skip_reason_text',
         'formula',
+        'wallet_type',
+        'wallet_type_text',
     ];
 
     public function statusList()
@@ -91,6 +93,41 @@ class Reward extends Common
         return \addons\shopro\service\partner\IdentityService::formatMadow($value);
     }
 
+    public function getWalletTypeAttr($value, $data)
+    {
+        $ext = $data['ext'] ?? [];
+        if (is_string($ext)) {
+            $ext = json_decode($ext, true) ?: [];
+        }
+        if (!empty($ext['wallet_type'])) {
+            return $ext['wallet_type'];
+        }
+        $rewardType = $data['reward_type'] ?? '';
+        if (in_array($rewardType, ['voucher_grant', 'voucher_release'], true)) {
+            return 'voucher';
+        }
+        if ($rewardType === 'madow_share') {
+            return 'madow';
+        }
+        if (intval($data['user_id'] ?? 0) === 0) {
+            return 'system';
+        }
+        return PartnerConfig::rewardWalletType();
+    }
+
+    public function getWalletTypeTextAttr($value, $data)
+    {
+        $type = $this->getWalletTypeAttr(null, $data);
+        $map = [
+            'money' => '商城余额',
+            'commission' => '佣金钱包',
+            'voucher' => '消费补贴券',
+            'madow' => '分红马豆',
+            'system' => '平台留存',
+        ];
+        return $map[$type] ?? '商城余额';
+    }
+
     public function buyer()
     {
         return $this->belongsTo(UserModel::class, 'buyer_id', 'id')->field('id, nickname, avatar, mobile');

application/admin/model/shopro/user/WalletLog.php

@@ -45,16 +45,16 @@ class WalletLog extends Common
             'transfer_by_commission' => '服务收益-转入到余额',
             'reward_income' => '收益分成-入账',
             'reward_back' => '收益分成-退还',
-            'push3' => '推荐开拓奖',
+            'push3' => '推荐提成',
             'maker_diff' => '创客进阶奖',
             'maker_peer' => '创客协同奖',
             'maker_overtaken' => '创客卓越奖',
-            'team_venue' => '酒道馆运营奖',
-            'team_county' => '区县统筹奖',
-            'venue_peer' => '酒道馆协同奖',
-            'county_peer' => '区县协同奖',
-            'venue_share' => '酒道馆加权奖励',
-            'county_share' => '区县加权奖励'
+            'team_venue' => '酒道馆管理奖',
+            'team_county' => '区县管理奖',
+            'venue_peer' => '酒道馆平级奖',
+            'county_peer' => '区县代平级奖',
+            'venue_share' => '酒道馆加权奖',
+            'county_share' => '区县加权奖'
         ],
         'commission' => [
             'withdraw' => '提现',
@@ -62,16 +62,16 @@ class WalletLog extends Common
             'reward_income' => '服务收益-入账',
             'reward_back' => '服务收益-退还',
             'transfer_to_money' => '服务收益-转出到余额',
-            'push3' => '推荐开拓奖',
+            'push3' => '推荐提成',
             'maker_diff' => '创客进阶奖',
             'maker_peer' => '创客协同奖',
             'maker_overtaken' => '创客卓越奖',
-            'team_venue' => '酒道馆运营奖',
-            'team_county' => '区县统筹奖',
-            'venue_peer' => '酒道馆协同奖',
-            'county_peer' => '区县协同奖',
-            'venue_share' => '酒道馆加权奖励',
-            'county_share' => '区县加权奖励'
+            'team_venue' => '酒道馆管理奖',
+            'team_county' => '区县管理奖',
+            'venue_peer' => '酒道馆平级奖',
+            'county_peer' => '区县代平级奖',
+            'venue_share' => '酒道馆加权奖',
+            'county_share' => '区县加权奖'
         ]
     ];
 
@@ -111,6 +111,6 @@ class WalletLog extends Common
         $type = $data['type'] ?? '';
         $event = $data['event'] ?? '';
         $eventMap = $this->getEventMap();
-        return $eventMap[$type][$event] ?? ($eventMap['commission'][$event] ?? '');
+        return $eventMap[$type][$event] ?? ($eventMap['money'][$event] ?? ($eventMap['commission'][$event] ?? ($event ?: '')));
     }
 }