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

service/agent/lib/Manage.php

@@ -258,10 +258,10 @@ class Manage
                 Dever::db('agent/order')->update(array('where_id' => $order_id, 'fdate' => time(), 'status' => 4, 'goods_status' => $goods_status));
 
                 # 通知短信
-                // if (Dever::project('sms')) {
-                //      $order = Dever::db('agent/order')->find($order_id);
-                //      Dever::load('sms/api')->send('daili_reg_yes', $order['mobile'], array('name' => $order['name']));
-                // }
+                if (Dever::project('sms')) {
+                     $order = Dever::db('agent/order')->find($order_id);
+                     Dever::load('sms/api')->send('daili_reg_yes', $order['mobile'], array('name' => $order['name']));
+                }
 
                 $order = Dever::db('agent/order')->find($order_id);
                 if ($order && $order['mid']) {

service/agent/lib/Member.php

@@ -195,7 +195,8 @@ class Member
         Dever::db('agent/member')->$method($data);
 
         if ($level_id) {
-            Dever::load('agent/lib/level_log')->up($mid, $order_id, $member['level_id'], $level_id, $sell, $member['sell'] + $sell, $group_num);
+            $member = Dever::db('agent/member')->find($mid);
+            Dever::load('agent/lib/level_log')->up($mid, $order_id, $member['level_id'], $level_id, $sell, $member['group_sell'] + $sell, $group_num);
         }
     }