From f69389abbf8c3b501de4add1c8d5f6256136827b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 6 Dec 2022 18:46:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91=E7=B3=BB=E7=BB=9F=E5=85=85=E5=80=BC=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/user/UserRechargeServices.php |  4 ++++
 crmeb/app/services/user/UserServices.php         | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php
index 9e091bca2..13181e5ee 100644
--- a/crmeb/app/services/user/UserRechargeServices.php
+++ b/crmeb/app/services/user/UserRechargeServices.php
@@ -109,6 +109,9 @@ class UserRechargeServices extends BaseServices
                 case 'weixin':
                     $item['_recharge_type'] = '公众号充值';
                     break;
+                case 'system':
+                    $item['_recharge_type'] = '系统充值';
+                    break;
                 default:
                     $item['_recharge_type'] = '其他充值';
                     break;
@@ -116,6 +119,7 @@ class UserRechargeServices extends BaseServices
             $item['_pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : '暂无';
             $item['_add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '暂无';
             $item['paid_type'] = $item['paid'] ? '已支付' : '未支付';
+            $item['avatar'] = strpos($item['avatar'], 'http') === false ? (sys_config('site_url') . $item['avatar']) : $item['avatar'];
             unset($item['user']);
         }
         return compact('list', 'count');
diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php
index d1f267c4a..3a49eface 100644
--- a/crmeb/app/services/user/UserServices.php
+++ b/crmeb/app/services/user/UserServices.php
@@ -781,6 +781,21 @@ class UserServices extends BaseServices
             if ($data['money_status'] == 1) {//增加
                 $edit['now_money'] = bcadd($user['now_money'], $data['money'], 2);
                 $res1 = $userMoneyServices->income('system_add', $user['uid'], $data['money'], $edit['now_money'], $data['adminId'] ?? 0);
+                //增加充值记录
+                $recharge_data = [
+                    'order_id' => app()->make(StoreOrderCreateServices::class)->getNewOrderId('cz'),
+                    'uid' => $id,
+                    'price' => $data['money'],
+                    'recharge_type' => 'system',
+                    'paid' => 1,
+                    'add_time' => time(),
+                    'give_price' => 0,
+                    'channel_type' => 'system',
+                    'pay_time' => time(),
+                ];
+                /** @var UserRechargeServices $rechargeServices */
+                $rechargeServices = app()->make(UserRechargeServices::class);
+                $rechargeServices->save($recharge_data);
             } else if ($data['money_status'] == 2) {//减少
                 if ($user['now_money'] > $data['money']) {
                     $edit['now_money'] = bcsub($user['now_money'], $data['money'], 2);