rabin 2 years ago
parent
commit
0a35a12e1d

+ 1 - 0
service/agent/database/import_log.php

@@ -8,6 +8,7 @@ $type = array
 	5 => '新系统不存在该地区',
     6 => '金额异常',
     7 => '创客名额',
+    8 => '角色金额不正确',
 );
 
 $status = array

+ 5 - 0
service/agent/lib/Import.php

@@ -612,6 +612,11 @@ class Import
                 } elseif ($role['type'] == 2) {
                     $price = Dever::load('area/api')->getPrice($role['area'], $v['area']);
                 }
+                if ($price > 0 && $price != $v['price']) {
+                    $this->log($v['mid'], 8,  $v['price'], $price, true);
+                }
+                echo $v['id'];
+                echo "\r\n";
             }
         }
     }

+ 4 - 4
service/agent/lib/Order.php

@@ -962,9 +962,9 @@ class Order
                 } elseif ($reward['num'] > 1) {
                     # 每推荐多少个,获取直推佣金
                     if (!$child_num) {
-                        $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1) + 1;
+                        $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1);
                     }
-                    if ($child_num > $reward['num'] && $child_num % $reward['num'] == 0) {
+                    if ($child_num >= $reward['num'] && $child_num % $reward['num'] == 0) {
                             $param['cash'] = $reward['value'];
                             $param['per'] = 0;
                     }
@@ -973,10 +973,10 @@ class Order
                 if ($reward['is_give'] == 1) {
                     $give = Dever::array_decode($reward['give']);
                     if (!$child_num) {
-                        $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1) + 1;
+                        $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1);
                     }
                     foreach ($give as $gv) {
-                        if (isset($gv['num']) && $child_num > $gv['num'] && $child_num % $gv['num'] == 0) {
+                        if (isset($gv['num']) && $child_num >= $gv['num'] && $child_num % $gv['num'] == 0) {
                             $prize_log = Dever::db('agent/member_prize')->find(array('mid' => $v['uid'], 'prize_id' => $gv['type'], 'child_num' => $child_num));
                             if (!$prize_log) {
                                 $prize = Dever::db('setting/prize')->find($gv['type']);