转账修改

app/admin/controller/Dashboard.php

@@ -171,7 +171,7 @@ class Dashboard extends Backend
             $logFrom = new UserMoneyLog();
             $logFrom->save([
                 'user_id'        => 0,
-                'money'          => -$money,
+                'money'          => $money,
                 'before'         => $bankFrom->current_balance + $money,
                 'after'          => $bankFrom->current_balance,
                 'type'           => 4,
@@ -224,9 +224,18 @@ class Dashboard extends Backend
             $result = false;
             $data   = $this->excludeFields($data);
 
-            if ($data['type'] == 2) {
-                $data['money'] = -$data['money'];
+            $bank = Bank::where('id', $data['bank_id'])->where('status', 1)->lock(true)->find();
+            if (!$bank) {
+                throw new ValidateException('银行账户不存在或已被禁用');
             }
+
+            if (in_array($data['type'], [2,4])) {
+                $bank->current_balance -= $data['money'];
+            } else {
+                $bank->current_balance += $data['money'];
+            }
+            $bank->save();
+
             $user_id = User::where('jk_username', $data['user_name'])->value('id');
             if (!$user_id) {
                 $this->error(__("The user can't find it", ['']));

app/admin/controller/user/MoneyLog.php

@@ -78,6 +78,7 @@ class MoneyLog extends Backend
      */
     public function add(int $userId = 0): void
     {
+        $this->error(__('No rows were added'));
         if ($this->request->isPost()) {
             $data = $this->request->post();
             if (!$data) {

web/src/lang/backend/en/user/moneyLog.ts

@@ -15,7 +15,7 @@ export default {
     User: 'User',
     'Transaction id': 'Transaction id',
     'Created by': 'Created by',
-    'type': '类型',
+    'type': 'Type',
     'type_list': {
         1 : 'Deposit',
         2 : 'Withdraw',

web/src/views/backend/dashboard.vue

@@ -14,7 +14,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="bank in visibleBanks" :key="bank.id" :class="bank.rowClass">
+                            <tr v-for="bank in visibleBanks" :key="bank.id" :class="bank.rowClass" :style="{ backgroundColor: bank.labelColor }">
                                 <td>
                                     <strong>{{ bank.name }}</strong>
                                     <small>{{ bank.account }}</small>
@@ -156,7 +156,7 @@
                     </el-radio-group>
                 </el-form-item>
                 <el-form-item label="Username">
-                    <el-input v-model="transactionForm.username" placeholder="e.g. PLAYER001" />
+                    <el-input v-model="transactionForm.username" :disabled="transactionDialog.mode === 'edit'" placeholder="e.g. PLAYER001" />
                 </el-form-item>
                 <el-form-item label="Remark">
                     <el-input v-model="transactionForm.remark" placeholder="(optional)" />
@@ -251,6 +251,7 @@ interface Bank {
     withdrawCount: number
     alert?: string
     rowClass?: string
+    labelColor?: string
 }
 
 interface DashboardBank {
@@ -271,6 +272,7 @@ interface DashboardBank {
     withdraw_count?: number | string
     safe_alert?: number | string
     status?: number | string
+    label_color?: string
 }
 
 interface Transaction {
@@ -396,6 +398,7 @@ const mapBank = (bank: DashboardBank): Bank => {
         withdrawCount: toNumber(bank.count_fund_out ?? bank.withdraw_count ?? bank.tx_out),
         alert: safeAlertLabels[safeAlert],
         rowClass: String(bank.status ?? '1') === '0' ? 'bank-muted' : '',
+        labelColor: bank.label_color || '',
     }
 }
 

web/src/views/backend/user/moneyLog/popupForm.vue

@@ -49,7 +49,7 @@
                             </el-radio-group>
                         </el-form-item>
                         <el-form-item label="Username">
-                            <el-input v-model="baTable.form.items!.user_name" placeholder="e.g. PLAYER001" />
+                            <el-input v-model="baTable.form.items!.user_name" disabled placeholder="e.g. PLAYER001" />
                         </el-form-item>
                         <el-form-item label="Remark" prop="memo">
                             <el-input v-model="baTable.form.items!.memo" placeholder="(optional)" />
@@ -290,7 +290,7 @@ const findTableRow = (rows: TableRow[] = [], id: number | string): TableRow | un
 
 const getUsername = (items: anyObj) => {
     const tableRow = findTableRow(baTable.table.data, items.id)
-    return items.user?.username || tableRow?.user?.username || ''
+    return items.user?.jk_username || tableRow?.user?.jk_username || ''
 }
 
 const initEditForm = () => {