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

service/agent/lib/Member.php

@@ -135,6 +135,8 @@ class Member
         if ($cash) {
             Dever::load('bill/lib/cash')->up($mid, $type, $cash, $role, $order_id, $desc, 2);
             $data['cash'] = $cash;
+        } else {
+            $data['cash'] = 0;
         }
 
         Dever::load('bill/lib/sell')->up($mid, $type, $sell, $role, $order_id, $desc);

service/agent/src/My.php

@@ -14,6 +14,12 @@ class My extends Core
         return Dever::load('invite/api')->setRelation(1006, 1005); 
     }
 
+    public function addtest()
+    {
+        $member = $this->user;
+        return Dever::load('agent/lib/member')->up($member, 1, 1, 1, $member['id'], 100, 100, 1, 'dddd', 1);
+    }
+
     /**
      * 立即签署
      *

service/bill/database/cash.php

@@ -321,6 +321,7 @@ return array
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
                 'type' => array('yes', 'in'),
+                'mid' => 'yes',
                 'status' => 2,
                 'state' => 1,
             ),

service/bill/lib/Cash.php

@@ -9,7 +9,7 @@ class Cash
     public function up($mid, $type, $cash, $role, $type_id, $desc, $status)
     {
         if ($cash == 0) {
-            return;
+            return false;
         }
         $member = Dever::db('agent/member')->find(array('id' => $mid, 'clear' => true));
         if ($member['status'] <= 2) {

service/bill/lib/Cron.php

@@ -6,6 +6,22 @@ use Dever;
 
 class Cron
 {
+    # 校正金额和业绩
+    public function jz_api()
+    {
+        $member = Dever::db('agent/member')->select();
+        if ($member) {
+            foreach ($member as $v) {
+                $where['mid'] = $v['id'];
+                $data = Dever::db('bill/cash')->getCash($where);
+                if ($data && $data['total']) {
+                    Dever::db('agent/member')->update(array('where_id' => $v['id'], 'cash' => $data['total']));
+                }
+            }
+        }
+        
+    }
+
     public function sell_api()
     {
     	# 按月份统计团队业绩

service/option/lib/Import.php

@@ -316,7 +316,7 @@ class Import
                                     $table_status['body'][0][0] += 1;
                                     $table_status['body'][0][1] += $v['C'];
                                 } else {
-                                    $table['body'][] = array($info['mobile'], $info['idcard'], $v['C'], $type_name, '导入到数据表失败');
+                                    $table['body'][] = array($info['mobile'], $info['idcard'], $v['C'], $type_name, '交付价值不足');
                                 }
                             } else {
                                 $table['body'][] = array($info['mobile'], $info['idcard'], $v['C'], $type_name, '未找到主账户');