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

app/goods/lib/Set.php

@@ -32,19 +32,19 @@ class Set
                     $give = Dever::input('give');
                     if ($give) {
                         $other_where['give'] = $give;
-                    }
-                    if ($table == 'agent/order_goods') {
+                    } elseif ($table == 'setting/role_goods') {
                         $where_type = Dever::input('type', 1);
                         if ($where_type) {
-                            $other_where['type'] = $where_type;
+                            $other_where['give'] = $where_type;
                         }
                     }
-                    if ($table == 'setting/role_goods') {
+                    if ($table == 'agent/order_goods') {
                         $where_type = Dever::input('type', 1);
                         if ($where_type) {
-                            $other_where['give'] = $where_type;
+                            $other_where['type'] = $where_type;
                         }
                     }
+                    
                     $other = Dever::db($table)->find($other_where);
                     $result[$i]['id'] = $v['id'];
                     $result[$i]['name'] = $v['name'];
@@ -131,19 +131,19 @@ class Set
                             $give = Dever::input('give');
                             if ($give) {
                                 $other_sku_where['give'] = $give;
-                            }
-                            if ($table == 'agent/order_goods') {
+                            } elseif ($table == 'setting/role_goods') {
                                 $where_type = Dever::input('type', 1);
                                 if ($where_type) {
-                                    $other_sku_where['type'] = $where_type;
+                                    $other_sku_where['give'] = $where_type;
                                 }
                             }
-                            if ($table == 'setting/role_goods') {
+                            if ($table == 'agent/order_goods') {
                                 $where_type = Dever::input('type', 1);
                                 if ($where_type) {
-                                    $other_sku_where['give'] = $where_type;
+                                    $other_sku_where['type'] = $where_type;
                                 }
                             }
+
                             $other_sku = Dever::db($table)->find($other_sku_where);
 
                             $children['select'] = 2;

service/setting/database/role_goods.php

@@ -161,5 +161,19 @@ return array
             'type' => 'all',
             'col' => '*',
         ),
+
+        'updateSet' => array
+        (
+            'type' => 'update',
+            'option' => array
+            (
+                'role_id' => 'yes',
+                'give' => 'yes',
+            ),
+            'set' => array
+            (
+                'state' => 'yes',
+            ),
+        ),
     ),
 );