dever 3 年之前
父節點
當前提交
b41fbdc037
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 3 2
      service/agent/database/order.php
  2. 5 1
      service/agent/lib/Order.php

+ 3 - 2
service/agent/database/order.php

@@ -575,14 +575,15 @@ return array
 
     'alter' => array
     (
-        4 => array
+        5 => array
         (
             array('update', 'price', 'price', 'float-11,2 0 实付金额'),
             array('update', 'f_price', 'f_price', 'float-11,2 0 原价'),
             array('update', 'agent_cash', 'agent_cash', 'float-11,2 0 代理费'),
             array('update', 'soft_cash', 'soft_cash', 'float-11,2 0 软件服务费'),
+            array('update', 'goods_cash', 'goods_cash', 'float-11,2 0 商品价值'),
         ),
-        'version' => 4,
+        'version' => 5,
     ),
 
     'manage' => array

+ 5 - 1
service/agent/lib/Order.php

@@ -582,6 +582,7 @@ class Order
         $parents = array_merge($parents, Dever::load('invite/api')->getParentAll($parent_member['id'], 20));
 
         $parent_per = 0;
+        $level_up = false;
         foreach ($parents as $k => $v) {
             $parent_info = Dever::db('agent/member')->find($v['uid']);
             if ($parent_info && $parent_info['status'] == 2) {
@@ -611,10 +612,13 @@ class Order
                     $level = Dever::db('setting/level')->getOne(array('target' => ($sell/10000)));
                     if ($level && $level['level'] > $parent_level['level']) {
                         # 升级
+                        $level_up = true;
+                        /* 本次不计算分润
                         $old = $parent_level;
                         $parent_info['level_id'] = $level['id'];
                         $parent_level = $level;
                         $parent_level['name'] = $old['name'] . '->' . $level['name'];
+                        */
                     }
 
                     # 获取直推人数
@@ -642,7 +646,7 @@ class Order
                     $param['type'] = 2;
                     $param['order_id'] = $info['id'];
                     $param['parent_mid'] = $parent_info['id'];
-                    if (isset($level) && $level) {
+                    if (isset($level_up) && $level_up && isset($level) && $level) {
                         $param['parent_level'] = $level['id'];
                         $param['child_num'] = $child_num;
                     }