Merge branch 'master' of http://git.dever.cc/dever-product/churen

app/shop/database/sell_order.php

@@ -117,9 +117,9 @@ if ($search_option_shop_type == 1) {
 }
 $mul = false;
 if (Dever::load('manage/auth')->checkFunc('menu_61.menu_85', 'piliangfafang', '批量收货')) {
-    $mul = '{status} == 4 && {shop_type} == 2';
+    $mul = '({status} == 4 || {status} == 2) && {shop_type} == 2';
 } elseif (Dever::load('manage/auth')->checkFunc('menu_61.menu_218', 'piliangfafang', '批量收货')) {
-    $mul = '{status} == 4 && {shop_type} == 2';
+    $mul = '({status} == 4 || {status} == 2) && {shop_type} == 2';
 }
 return array
 (
@@ -137,7 +137,7 @@ return array
     (
         'insert' => 'shop/lib/manage.sellOrderUpdate',
         'update' => 'shop/lib/manage.sellOrderUpdate',
-        'updatemul' => 'shop/lib/manage.setSellOrderStatusMul',
+        'updatemul' => 'shop/lib/manage.setSellOrderStatusMul_commit',
     ),
     # 数据结构
     'struct' => array
@@ -596,7 +596,7 @@ return array
             'list'      => true,
             'list_order' => 14,
             'mul'   => true,
-            'mul_option' => array(5 => '确认收货'),
+            'mul_option' => array(3 => '批量审核', 5 => '确认收货'),
         ),
 
         'audit'        => array

app/shop/lib/Manage.php

@@ -319,11 +319,12 @@ class Manage
         }
     }
 
-    public function setSellOrderStatusMul($id, $name, $data)
+    public function setSellOrderStatusMul_commit($id, $name, $data)
     {
         Dever::config('base')->hook = true;
         $status = Dever::param('status', $data);
         if ($status == 5) {
+            # 批量确认收货
             $list = explode(',', $id);
             if ($list) {
                 foreach ($list as $k => $v) {
@@ -334,10 +335,26 @@ class Manage
                         $id = $v;
                         $info = Dever::db('shop/sell_order')->one($id);
                     }
+                    if ($info['status'] != 4) {
+                        Dever::alert($info['order_num'] . '该订单无法确认收货');
+                    }
                     $info['status'] = 4;
                     Dever::load('shop/lib/sell')->finish($info, $info['shop_id']);
                 }
             }
+        } elseif ($status == 3) {
+            # 批量审核
+            $list = explode(',', $id);
+            if ($list) {
+                foreach ($list as $k => $v) {
+                    if (is_array($v)) {
+                        $id = $v['id'];
+                    } else {
+                        $id = $v;
+                    }
+                    Dever::load('shop/lib/sell')->auditOne($id);
+                }
+            }
         }
     }
 

app/shop/lib/Sell.php

@@ -2208,10 +2208,22 @@ class Sell
     public function audit_commit()
     {
         $order_id = Dever::input('order_id');
+        $this->auditOne($order_id);
+
+        return 'ok';
+    }
+
+    # 采购订单审核 拆单
+    public function auditOne($order_id)
+    {
         $order = Dever::db('shop/sell_order')->find($order_id);
 
-        if (!$order || ($order && $order['status'] != 2)) {
-            Dever::alert('当前订单状态无法拆单');
+        if (!$order) {
+            Dever::alert('订单不存在');
+        }
+
+        if ($order && $order['status'] != 2) {
+            Dever::alert($order['order_num'] . '当前订单状态无法拆单');
         }
 
         if ($order['shop_type'] != 2) {

learn/active/lib/Manage.php

@@ -491,7 +491,7 @@ Class Manage
             //'refund_order_id' => '',
         );
         if ($type != 1) {
-            $param['refund_order_id'] = count($info);
+            $param['refund_order_id'] = count($info) + 1;
         }
         
         if ($data['price'] > 0) {

service/agent/lib/Order.php

@@ -974,6 +974,34 @@ class Order
                 $cash = 0;
                 $level = array();
 
+                $param = array();
+
+                # 自动升级
+                $role_up = Dever::db('setting/role_up')->getData(array('role_id' => $parent_role['id']));
+                if ($role_up) {
+                    if (!$parent_info['group_sell']) {
+                        $parent_info['group_sell'] = 0;
+                    }
+                    $group_sell = $parent_info['group_sell'] + $info['agent_cash'];
+                    if (!$child_num) {
+                        $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1);
+                    }
+                    foreach ($role_up as $rv) {
+                        if ($child_num >= $rv['num'] && $group_sell >= ($rv['sell']*10000)) {
+                            # 可以升级为新角色
+                            $rv_role = Dever::db('setting/role')->find($rv['t_role_id']);
+                            if ($rv_role) {
+                                $param['role_up'] = $rv;
+                                $parent_role_name = $parent_role['name'] . '->' . $rv_role['name'];
+                                $parent_role = $rv_role;
+                                $parent_role['name'] = $parent_role_name;
+                                
+                                break;
+                            }
+                        }
+                    }
+                }
+
                 if ($parent_per < $max_per) {
                     $order_cash = Dever::db('agent/order_cash')->getData(array('order_id' => $info['id'], 'parent_mid' => $v['uid'], 'type' => 2));
 
@@ -1022,32 +1050,6 @@ class Order
                         $this->show_area_reward($parent_info, $info, $role, $v, $parent_role, $parent_level, $area_agent, $table);
                     }
                 }
-
-                $param = array();
-
-                # 自动升级
-                /*
-                $role_up = Dever::db('setting/role_up')->getData(array('role_id' => $parent_role['id']));
-                if ($role_up) {
-                    if (!$parent_info['group_sell']) {
-                        $parent_info['group_sell'] = 0;
-                    }
-                    $group_sell = $parent_info['group_sell'] + $info['agent_cash'];
-                    if (!$child_num) {
-                        $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1);
-                    }
-                    foreach ($role_up as $rv) {
-                        if ($child_num >= $rv['num'] && $group_sell >= ($rv['sell']*10000)) {
-                            # 可以升级为新角色
-                            $rv_role = Dever::db('setting/role')->find($rv['t_role_id']);
-                            if ($rv_role) {
-                                $param['role_up'] = $rv;
-                                $parent_role['name'] = $parent_role['name'] . '->' . $rv_role['name'];
-                                break;
-                            }
-                        }
-                    }
-                }*/
                 
                 $param['type'] = 2;
                 $param['order_id'] = $info['id'];
@@ -1314,6 +1316,7 @@ class Order
                 }*/
 
                 # 自动升级
+                /*
                 $role_up = Dever::db('setting/role_up')->getData(array('role_id' => $parent_role['id']));
                 if ($role_up) {
                     if (!$parent_info['group_sell']) {
@@ -1334,7 +1337,7 @@ class Order
                             }
                         }
                     }
-                }
+                }*/
 
                 if ($param['cash'] >= 0) {
                     $data_param = Dever::array_encode($param);