rabin 2 years ago
parent
commit
01fab2d52a

+ 1 - 1
service/agent/lib/Manage.php

@@ -865,7 +865,7 @@ class Manage
                 $member = Dever::db('agent/member')->find($where['mid']);
                 $desc = $member['name'] . '成为代理商,佣金'.$t['per'].'%';
                 
-                Dever::load('agent/lib/member')->up($where['parent_mid'], $order['id'], $order['role'], $where['type'], $t['cash'], $order['agent_cash'], $t['parent_level'], $desc, $t['child_num']);
+                Dever::load('agent/lib/member')->up($member, $where['parent_mid'], $order['id'], $order['role'], $where['type'], $t['cash'], $order['agent_cash'], $t['parent_level'], $desc, $t['child_num']);
 
 
                 # 自动升级

+ 2 - 2
service/agent/lib/Member.php

@@ -168,7 +168,7 @@ class Member
      * 更新余额和业绩
      * @return mixed
      */
-    public function up($mid, $order_id, $role, $type, $cash, $sell, $level_id = false, $desc = '', $group_num = 0)
+    public function up($child, $mid, $order_id, $role, $type, $cash, $sell, $level_id = false, $desc = '', $group_num = 0)
     {
         $member = Dever::db('agent/member')->find(array('id' => $mid, 'clear' => true));
         $data['where_id'] = $mid;
@@ -179,7 +179,7 @@ class Member
             $data['cash'] = 0;
         }
 
-        Dever::load('bill/lib/sell')->up($mid, $type, $sell, $role, $order_id, $desc);
+        Dever::load('bill/lib/sell')->up($child, $mid, $type, $sell, $role, $order_id, $desc);
         
         $data['upcol'] = $sell;
         if ($level_id) {

+ 23 - 1
service/agent/lib/Tool.php

@@ -548,7 +548,29 @@ class Tool
             }
 
             foreach ($data as $k => $v) {
-                Dever::load('agent/agreement')->upContent($v['id']);
+                Dever::load('agent/lib/agreement')->upContent($v['id']);
+            }
+        }
+
+        return 'ok';
+    }
+
+    # 更新业绩流水里的分组id
+    public function upSell_api()
+    {
+        $data = Dever::db('bill/sell')->getChildData();
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v['type_id'] && $v['type_id'] > 0) {
+                    $order = Dever::db('agent/order')->find($v['type_id']);
+                    if ($order) {
+                        $child_mid = Dever::load('invite/api')->getRelation($order['mid'], $v['mid']);
+                        if ($child_mid) {
+                            Dever::db('bill/sell')->update(array('where_id' => $v['id'], 'child_mid' => $child_mid));
+                        }
+                    }
+                }
             }
         }
 

+ 24 - 0
service/bill/database/sell.php

@@ -83,6 +83,16 @@ return array
             'list_order' => 1,
         ),
 
+        'child_mid'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '下级直推的mid',
+            'default'   => '-1',
+            'desc'      => '下级直推的mid',
+            'match'     => 'is_string',
+            'update'    => 'text',
+        ),
+
         'agent-member-name'=> array
         (
             'name'      => '姓名',
@@ -296,5 +306,19 @@ return array
             'type' => 'one',
             'col' => 'sum(num) as total',
         ),
+
+        'getChildData' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'child_mid' => -1,
+                'state' => 1,
+            ),
+            'order' => array('id' => 'desc'),
+            'type' => 'all',
+            'limit' => '0,1000',
+            'col' => '*',
+        ),
     ),
 );

+ 7 - 1
service/bill/lib/Sell.php

@@ -37,7 +37,7 @@ class Sell
     }
 
     # 更新数据
-    public function up($mid, $type, $num, $role, $type_id, $desc, $stype = 1, $cdate = false)
+    public function up($child, $mid, $type, $num, $role, $type_id, $desc, $stype = 1, $cdate = false)
     {
         if ($num == 0) {
             return;
@@ -54,6 +54,12 @@ class Sell
             $info = Dever::db('bill/sell')->find($where);
             if (!$info) {
                 $data = $where;
+                if ($child && isset($child['id'])) {
+                    $child_mid = Dever::load('invite/api')->getRelation($child['id'], $mid);
+                    if ($child_mid) {
+                        $data['child_mid'] = $child_mid;
+                    }
+                }
                 if ($cdate) {
                     $data['cdate'] = $cdate;
                 }