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

service/agent/lib/Member.php

@@ -399,6 +399,7 @@ class Member
             'name' => '查看直推团队',
         );
 
+        
         /*
         $button[2]['btn'][] = array
         (
@@ -417,6 +418,15 @@ class Member
                 'name' => '设置直推上级',
             );
         }
+        // if (Dever::load('manage/auth')->checkFunc('agent.member','setmessage','发送短信')) {
+        //     $button[2]['btn'][] = array
+        //     (
+        //         'type' => 'edit',
+        //         'link' => Dever::url('project/database/update?project=sms&table=template&search_option_state=1&search_option_type=daili_reg_yes,daili_reg_no,daili_goods_no,daili_tixian_yes,daili_tixian_no,daili_hetong_no&search_option_name='.$member['name'].'&search_option_mobile='.$member['mobile'], 'manage'),
+        //         'name' => '发送短信',
+        //     );
+        // }
+
 
         /*
         if (Dever::load('manage/auth')->checkFunc('agent.member', 'edit6', '查看关系图谱')) {
@@ -451,7 +461,7 @@ class Member
         $level = Dever::db('setting/level')->one($member['level_id']);
         $area = Dever::load("area/api.string", $member['area'], '-', true, '');
         $code = Dever::load("invite/api.code", $member['id']);
-
+        $title = Dever::db('setting/title')->find($member['title_id']);
         if ($member['shop_id']) {
             $shop = Dever::db('shop/info')->one($member['shop_id']);
         } else {
@@ -491,6 +501,7 @@ class Member
                 $member['name'],
                 array('手机号', $member['mobile']),
                 array('邀请码', $code),
+                array('代理商头衔', $title['name']),
                 array('代理角色', $role['name']),
                 array('代理区域', $area),
                 array('所属店铺', $shop['name']),

service/bill/lib/Cron.php

@@ -600,6 +600,9 @@ class Cron
                 if($res){
                     foreach($res as $k2 => $v2){
                         $insert['where_id'] = $v2['id'];
+                        if($v2['out_num'] == 0 && $v2['out_money'] != 0){
+                            $insert['set_out_money'] = 0;
+                        }
                         Dever::db('bill/shop_stat')->update($insert);
                     } 
                 }else{

service/bill/lib/Manage.php

@@ -336,10 +336,10 @@ class Manage
         $shop = Dever::db('shop/info')->find($info['shop_id']);
         $html = $shop['name'];
         $html .= '<br />' .$shop['sid'];
-        if($shop['mid'] && $shop['mid']>0){
-            $member = Dever::db('agent/member')->find($shop['mid']);
+        if($shop['agent_mid'] && $shop['agent_mid']>0){
+            $member = Dever::db('agent/member')->find($shop['agent_mid']);
             if($member){
-                $html .= '<br />' .$member['mobile'];
+                $html .= '<br />' .$member['name'].$member['mobile'];
             }
         }
         return $html;