Browse Source

提现限制

Kirin 2 years ago
parent
commit
3fba9354b0

+ 8 - 2
app/admin/model/order/StoreOrder.php

@@ -565,7 +565,10 @@ HTML;
                     $model = $model->where($aler . 'pay_type', 'yue');
                     $model = $model->where($aler . 'pay_type', 'yue');
                     break;
                     break;
                 case 3:
                 case 3:
-                    $model = $model->where($aler . 'pay_type', 'offline');
+                    $model = $model->where($aler . 'pay_type', 'offline')->where('offline_type', 0);
+                    break;
+                case 5:
+                    $model = $model->where($aler . 'pay_type', 'offline')->where('offline_type', 1);
                     break;
                     break;
                 case 4:
                 case 4:
                     $model = $model->where($aler . 'pay_type', 'jialie');
                     $model = $model->where($aler . 'pay_type', 'jialie');
@@ -1369,9 +1372,12 @@ HTML;
         $where['pay_type'] = 2;
         $where['pay_type'] = 2;
         $yue = self::getOrderWhere($where, new self)->count();
         $yue = self::getOrderWhere($where, new self)->count();
         $where['pay_type'] = 3;
         $where['pay_type'] = 3;
-        $offline = self::getOrderWhere($where, new self)->count();
+        $cash = self::getOrderWhere($where, new self)->count();
         $where['pay_type'] = 4;
         $where['pay_type'] = 4;
         $jialie = self::getOrderWhere($where, new self)->count();
         $jialie = self::getOrderWhere($where, new self)->count();
+        $where['pay_type'] = 5;
+        $scan = self::getOrderWhere($where, new self)->count();
+        $offline = $cash + $scan;
         return compact('weixin', 'yue', 'offline', 'jialie');
         return compact('weixin', 'yue', 'offline', 'jialie');
     }
     }
 }
 }

+ 2 - 1
app/admin/view/order/store_order/index.php

@@ -520,7 +520,8 @@
                     {name: '全部', value: ''},
                     {name: '全部', value: ''},
                     {name: '微信支付', value: 1, count: payTypeCount.weixin},
                     {name: '微信支付', value: 1, count: payTypeCount.weixin},
                     {name: '余额支付', value: 2, count: payTypeCount.yue},
                     {name: '余额支付', value: 2, count: payTypeCount.yue},
-                    {name: '线下支付', value: 3, count: payTypeCount.offline},
+                    {name: '现金支付', value: 3, count: payTypeCount.cash},
+                    {name: '扫码支付', value: 5, count: payTypeCount.scan},
                     {name: '嘉联支付', value: 4, count: payTypeCount.jialie},
                     {name: '嘉联支付', value: 4, count: payTypeCount.jialie},
                 ],
                 ],
                 orderType: [
                 orderType: [