Merge branch 'minus' into dev

biz-ghs/shop/classes/ShopMoneyClass.php

@@ -15,14 +15,14 @@ class ShopMoneyClass extends BaseClass
     //散客用现金充值 ssh 20250804
     public static function skRecharge($data, $main)
     {
-        $amount = $data['amount'] ?? 0;
+        $amount = $data['amount'] ? floatval($data['amount']) : 0;
         $main->money = bcadd($main->money, $amount, 2);
         $main->save();
         $balance = $main->money ?? 0;
         $data['balance'] = $balance;
         $data['io'] = 1;
         $customName = $data['customName'] ?? '';
-        $event = $customName . '现金充值' . $amount . '元';
+        $event = $customName . '现金充值自己的余额' . $amount . '元';
         $capitalType = dict::getDict('capitalType', 'xhRecharge', 'id');
         $data['capitalType'] = $capitalType;
         $data['event'] = $event;

biz-hd/recharge/classes/RechargeClass.php

@@ -202,7 +202,13 @@ class RechargeClass extends BaseClass
         }
 
         $getBalance = $amount;
-        $event = $onlinePay == 2 ? '线上充值' : '线下充值';
+        if ($onlinePay == 2) {
+            $event = $payWay == 0 ? '线上 微信充值' : '线上 支付宝充值';
+        } else {
+            $channel = $payWay == 0 ? '微信' : $payWay == 1 ? '支付宝' : $payWay == 4 ? '现金' : '银行卡';
+            $event = "线下 {$channel}充值";
+        }
+
         //赠送的金额
         if ($addGiveAmount > 0) {
             $event .= floatval($getBalance) . "（送" . floatval($addGiveAmount) . "）";