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

application/admin/controller/shopro/order/Order.php

@@ -242,7 +242,7 @@ class Order extends Common
 
                 // 友好展示金额
                 if ($type === 'voucher_grant') {
-                    $amountText = number_format($baseAmount, 2, '.', '') . ' 兑换券';
+                    $amountText = number_format($baseAmount, 2, '.', '') . ' 个';
                 } elseif ($madow > 0) {
                     $amountText = \addons\shopro\service\partner\IdentityService::formatMadow($madow) . ' 马豆';
                 } elseif ($amount > 0) {
@@ -270,6 +270,8 @@ class Order extends Common
                     )),
                     'formula' => (string) ($row->formula ?? ''),
                     'skip_reason_text' => (string) ($row->skip_reason_text ?? ''),
+                    'wallet_type' => (string) ($row->wallet_type ?? ($amount > 0 ? \addons\shopro\service\partner\PartnerConfig::rewardWalletType() : 'system')),
+                    'wallet_type_text' => (string) ($row->wallet_type_text ?: ($amount > 0 ? (\addons\shopro\service\partner\PartnerConfig::rewardWalletType() === 'money' ? '商城余额' : '佣金钱包') : '平台留存')),
                 ];
             }
 
@@ -299,6 +301,8 @@ class Order extends Common
                             'base_amount' => '0.00',
                             'amount_text' => '¥' . number_format($cCommission, 2, '.', ''),
                             'madow' => '0.00000000',
+                            'wallet_type' => 'commission',
+                            'wallet_type_text' => '佣金钱包',
                             'status' => $cStatus,
                             'status_text' => (string) ($crow->status_text ?: ($cStatus === 1 ? '已入账' : '待入账')),
                             'formula' => '分销规则佣金',
@@ -393,6 +397,8 @@ class Order extends Common
                             'total_amount' => number_format($platAmount, 2, '.', ''),
                             'total_madow' => \addons\shopro\service\partner\IdentityService::formatMadow($platMadow),
                             'amount_text' => $amountText,
+                            'wallet_type' => 'system',
+                            'wallet_type_text' => '平台留存',
                             'settle_date' => $settleDate,
                             'status' => 1,
                             'status_text' => '已入账',
@@ -424,6 +430,8 @@ class Order extends Common
                         'total_amount' => number_format($totalAmount, 2, '.', ''),
                         'total_madow' => \addons\shopro\service\partner\IdentityService::formatMadow($totalMadow),
                         'amount_text' => $type === 'madow_share' ? ($eachMadow . ' 马豆/人') : ('¥' . $eachAmount . '/人'),
+                        'wallet_type' => $type === 'madow_share' ? 'madow' : \addons\shopro\service\partner\PartnerConfig::rewardWalletType(),
+                        'wallet_type_text' => $type === 'madow_share' ? '分红马豆' : (\addons\shopro\service\partner\PartnerConfig::rewardWalletType() === 'money' ? '商城余额' : '佣金钱包'),
                         'settle_date' => $settleDate,
                         'status' => 1,
                         'status_text' => '已入账',