Merge branch 'dev' of http://rungit.jxdsy.cn:10000/sugar/introducer into dev

application/admin/controller/shopro/order/Goodsorder.php

@@ -162,8 +162,25 @@ class Goodsorder extends Backend
             $this->model->where(['id' => $param['order_id']])->update($save);
             $this->success('发货成功');
         }else{
+            $groupdata=[
+                'YTO'=>'圆通速递',
+                'HTKY'=>'百世快递',
+                'ZTO'=>'中通快递',
+                'STO' =>'申通快递',
+                'YD'=>'韵达速递',
+                'SF'=>'顺丰速运',
+                'ZTO' =>'中通快递',
+                'YZPY'=>'邮政快递包裹',
+                'EMS'=>'EMS',
+                'HHTT'=>'天天快递',
+                'JD'=>'京东快递',
+                'UC'=>'优速快递',
+                'DBL' =>'德邦快递',
+                'ZJS'=>'宅急送',
+                'TNT'=>'TNT快递',
+            ];
             $order_id = $this->request->param('ids');
-            $this->view->assign('groupdata', ['YTO'=>'圆通速递','HTKY'=>'百世快递','ZTO'=>'中通快递','YD'=>'韵达速递','SF'=>'顺丰速运']);
+            $this->view->assign('groupdata', $groupdata);
             $this->view->assign('order_id', $order_id);
             return $this->view->fetch();
         }

application/admin/controller/users/Withdraw.php

@@ -56,6 +56,8 @@ class Withdraw extends Backend
     {
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
+        $filter = json_decode($this->request->get("filter"),true);
+        $op = json_decode($this->request->get("op"),true);
         if (false === $this->request->isAjax()) {
             return $this->view->fetch();
         }
@@ -73,8 +75,13 @@ class Withdraw extends Backend
             ->where($where)
             ->where(['status' => 1])
             ->sum('money');
+        $user_where = [];
+        if(isset($filter['name'])) {
+            $user_where['realname'] = $filter['name'];
+        }
         $total_money = $this->usersmodel
             ->where(['id'=>['not in',[191,183,176,15,34,33,26,21,14,13,5]]])
+            ->where($user_where)
             ->sum('total_money');
         $result = ['total' => $list->total(), 'rows' => $list->items(), 'total_withraw' => sprintf("%.2f", $total_withraw / 100),'total_money' =>$total_money];
         return json($result);