Merge branch 'store_balance_1110'

app/Admin/Common/Type.php

@@ -21,12 +21,16 @@ class Type
         11 => '服务商发展新用户',
         12 => '服务商发展新商户',
         13 => '服务商线上订单分账',
+        14 => '用户订单退款（直接退）',
 
         100 => '用户线下支付订单',
         101 => '用户线上支付订单',
         102 => '服务商提现类型',
         103 => '市场经理提现类型',
         104 => '社区提现类型',
+
+        105 => '商户提现类型',
+        106 => '商户订单退款（直接退）',
     ];
 
     const USER_TYPE_LIST = [
@@ -62,6 +66,7 @@ class Type
     const MONEY_TYPE_MP_PLAT_NEW_USER = 11; // 服务商发展新用户
     const MONEY_TYPE_MP_PLAT_NEW_STORE = 12; // 服务商发展新商户
     const MONEY_TYPE_MP_OL_ORDER = 13; // 服务商线上订单分账（线上订单完成）
+    const MONEY_TYPE_USER_OL_ORDER_DIRECT_REFUND    = 14; // 用户订单退款（直接退）
 
     const MONEY_TYPE_USER_OFL_ORDER = 100; // 用户线下支付订单
     const MONEY_TYPE_USER_OL_ORDER = 101; // 用户线上支付订单
@@ -69,6 +74,9 @@ class Type
     const  MONEY_TYPE_MM = 103; //市场经理提现类型
     const  MONEY_TYPE_CS = 104; //社区提现类型
 
+    const MONEY_TYPE_STORE_WITHDRAW         = 105; // 商户提现类型
+    const MONEY_TYPE_STORE_OL_ORDER_DIRECT_REFUND   = 106; // 商户订单退款（直接退）
+
     // 账户类型 
     const USER_TYPE_LEDGER = -1; // 虚拟账户
     const USER_TYPE_USER = 1; // user用户

app/Admin/Renderable/StoreBalance.php

@@ -25,6 +25,8 @@ class StoreBalance extends LazyRenderable
             });
         }
 
+        $model = $model::where('user_type', Type::USER_TYPE_STORE)->where('user_id',$userId);
+
         return Grid::make($model, function (Grid $grid) {
             $grid->column('id','ID');
             $grid->column('user_type','账户类型')->display(function($userType){
@@ -37,8 +39,8 @@ class StoreBalance extends LazyRenderable
             });
            
             $grid->column('money','金额');
-            $grid->column('current_balance','账户余额');
-            $grid->column('comment','描述');
+            $grid->column('current_balance','入账前余额');
+            $grid->column('comment','描述')->width('16%');
             $grid->column('status','状态') 
                 ->using(
                     FinancialRecord::$status
@@ -63,8 +65,8 @@ class StoreBalance extends LazyRenderable
                 $filter->equal('money','流水金额')->width(3);
                 $filter->equal('source_id','关联流水ID')->width(3);
 
-                $filter->equal('money_type','流水类型')->select($userTypeList)->width(4);
-                $filter->equal('user_type','账户类型')->select($moneyTypeList)->width(4);
+                $filter->equal('money_type','流水类型')->select($moneyTypeList)->width(4);
+                // $filter->equal('user_type','账户类型')->select($userTypeList)->width(4);
                 $filter->equal('source_type','关联类型')->select($sourceTYpeList)->width(4);
 
                 $filter->whereBetween('created_at',function($q){