Explorar o código

余额变动记录

zac3533 hai 1 ano
pai
achega
72b5a7ac2a

+ 12 - 6
application/admin/lang/vn/trade/moneylog.php

@@ -2,11 +2,17 @@
 
 return [
     'Id'          => 'ID',
-    'User_id'     => '用户',
-    'From_id'     => '来源用户',
-    'Amount'      => '变动金额',
-    'Balance'     => '实时余额',
-    'Create_time' => '创建时间',
-    'Action'      => '动作',
+    'User_id'     => 'người dùng',
+    'From_id'     => 'Người dùng nguồn',
+    'Amount'      => 'Thay đổi nhiều',
+    'Balance'     => 'cân bằng thời gian thực',
+    'Create_time' => 'thời gian sáng tạo',
+    'Action'      => 'hoạt động',
+    '待支付'                  => 'Được trả tiền',
+    '完成'                    => 'Hoàn thành',
+    '冻结'                    => 'đông cứng',
+    '取消'                    => 'Hủy bỏ',
+    '暂停抢单'                => 'Tạm dừng lấy đơn hàng',
+    '驳回'                    =>  'từ chối', 
   
 ];

+ 6 - 0
application/admin/lang/zh-cn/trade/money_log.php

@@ -8,5 +8,11 @@ return [
     'Balance'     => '实时余额',
     'Create_time' => '创建时间',
     'Action'      => '动作',
+    '待支付'                  => '待支付',
+    '完成'                    => '完成',
+    '冻结'                    => '冻结',
+    '取消'                    => '取消',
+    '暂停抢单'                => '暂停抢单',
+    '驳回'                    =>  '驳回', 
 
 ];

+ 7 - 6
application/api/lang/zh-cn/order.php

@@ -5,10 +5,11 @@ return [
     '完成'                    => '完成',
     '冻结'                    => '冻结',
     '取消'                    => '取消',
-    '暂停抢单'                 => '暂停抢单',
-    '余额不足'                 => '余额不足,请先充值',
-    '今日任务已完成'            => '今日任务已完成,请明天再来',
-    '参数错误'                 => '参数错误,请联系管理员',
-    '未匹配到商品'              => '价格区间未匹配到商品',
-    '有未完成订单'              => '您有未完成订单,请完成后再来',
+    '暂停抢单'                => '暂停抢单',
+    '驳回'                    =>  '驳回',   
+    '余额不足'                => '余额不足,请先充值',
+    '今日任务已完成'           => '今日任务已完成,请明天再来',
+    '参数错误'                => '参数错误,请联系管理员',
+    '未匹配到商品'             => '价格区间未匹配到商品',
+    '有未完成订单'             => '您有未完成订单,请完成后再来',
 ];

+ 8 - 1
application/common/model/MoneyLog.php

@@ -32,6 +32,7 @@ class MoneyLog extends Model
     const OrderBonus    = 5;
     const Commission    = 6;
     const SystemChange  = 7;
+    const Reject        = 8;
 
     protected function getStatusNamesArr(){
         $status_names = [
@@ -43,6 +44,7 @@ class MoneyLog extends Model
             self::OrderBonus        => __('佣金'),
             self::Commission        => __('奖励'),
             self::SystemChange      => __('系统'),
+            self::Reject            => __('驳回'),
         ];
         return $status_names;
     }
@@ -81,7 +83,12 @@ class MoneyLog extends Model
             throw new Exception(__('账变类型不存在'));
         }
 
-        $balance = function_exists('bcadd') ? bcadd($user->balance, $amount, 2) : $user->balance + $amount;
+        //余额
+        $balance = in_array($action, [self::Reject]) ? bcsub($user->balance, $amount, 2) : bcadd($user->balance, $amount, 2);
+        if($balance < 0){
+            throw new Exception(__('余额不足'));
+        }
+
         //更新会员信息
         $user->save(['balance' => $balance]);
         //写入日志

+ 1 - 1
public/assets/js/backend/trade/money_log.js

@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'balance', title: __('Balance'), operate: false},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'action', title: __("Action"),
-                            searchList: {1:__('充值'), 2:__('提现'), 3:__('交易'), 4:__('交易'), 5:__('佣金'), 6:__('奖励'), 7:__('系统调整')},
+                            searchList: {1:__('充值'), 2:__('提现'), 3:__('交易'), 4:__('交易'), 5:__('佣金'), 6:__('奖励'), 7:__('系统调整'), 8:__('驳回')},
                             formatter: Table.api.formatter.status
                         },
                         //{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}