dever пре 3 година
родитељ
комит
934ea87d5b
2 измењених фајлова са 7 додато и 7 уклоњено
  1. 2 2
      app/goods/lib/Set.php
  2. 5 5
      service/agent/lib/Manage.php

+ 2 - 2
app/goods/lib/Set.php

@@ -55,7 +55,7 @@ class Set
                                 $result[$i]['min'] = $other['min'];
                             }
                             if (isset($other['total_num'])) {
-                                if ($col == 'type_id') {
+                                if ($col == 'type_id' && $table != 'agent/member_goods') {
                                     $result[$i]['total'] = $other['total_num'];
                                 } else {
                                     $result[$i]['total'] = $other['total_num'] - $other['sell_num'];
@@ -128,7 +128,7 @@ class Set
                                         $children['min'] = $other_sku['min'];
                                     }
                                     if (isset($other_sku['total_num'])) {
-                                        if ($col == 'type_id') {
+                                        if ($col == 'type_id' && $table != 'agent/member_goods') {
                                             $children['total'] = $other_sku['total_num'];
                                         } else {
                                             $children['total'] = $other_sku['total_num'] - $other_sku['sell_num'];

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

@@ -136,7 +136,7 @@ class Manage
                             $where['mobile'] = $order['mobile'];
                             $member = Dever::db('agent/member')->find($where);
                             if ($member) {
-                                $update['mid'] = $member['id'];
+                                $order['mid'] = $update['mid'] = $member['id'];
                             } else {
                                 $data = $where;
                                 $data['name'] = $order['name'];
@@ -149,14 +149,14 @@ class Manage
                                 $data['role'] = 1;
                                 $data['parent_mid'] = $order['parent_mid'];
                                 $data['source_id'] = $order['source_id'];
-                                $update['mid'] = Dever::db('agent/member')->insert($data);
+                                $order['mid'] = $update['mid'] = Dever::db('agent/member')->insert($data);
 
                                 Dever::load('invite/api')->setRelation($update['mid'], $data['parent_mid']);
                             }
-
-                            # 增加业绩
-                            Dever::load('bill/lib/sell')->up($update['mid'], 2, $order['price'], $order['role'], $order['id'], $order['name'] . '成为代理商');
                         }
+
+                        # 增加业绩
+                        Dever::load('bill/lib/sell')->up($order['mid'], 2, $order['price'], $order['role'], $order['id'], $order['name'] . '成为代理商');
                     }
 
                     Dever::db('agent/order')->update($update);