rabin 2 years ago
parent
commit
a91576f548
2 changed files with 11 additions and 10 deletions
  1. 4 10
      service/agent/lib/Import.php
  2. 7 0
      service/agent/lib/Manage.php

+ 4 - 10
service/agent/lib/Import.php

@@ -605,18 +605,12 @@ class Import
         $data = Dever::db('agent/order')->select();
         if ($data) {
             foreach ($data as $k => $v) {
-
                 $role = Dever::db('setting/role')->find($v['role']);
+                $price = 0;
                 if ($role['type'] == 1) {
-                    $data['price'] = $role['price'];
-                } elseif ($data['role']['type'] == 2) {
-                    $data['area'] = $this->checkArea($data['area'], $data['role'], $member ? $member['id'] : false);
-                    $data['price'] = Dever::load('area/api')->getPrice($data['role']['area'], $data['area']);
-                    if ($data['price'] <= 0) {
-                        Dever::alert('代理区域的代理价格为空,请联系客服');
-                    }
-                } else {
-                    Dever::alert('代理类型不正确');
+                    $price = $role['price'];
+                } elseif ($role['type'] == 2) {
+                    $price = Dever::load('area/api')->getPrice($role['area'], $v['area']);
                 }
             }
         }

+ 7 - 0
service/agent/lib/Manage.php

@@ -205,6 +205,13 @@ class Manage
                 $area_string = implode(',', $area);
                 $area_string = str_replace(',-1', '', $area_string);
             }
+            if ($role['type'] == 1) {
+                $data['set_f_price'] = $data['set_price'] = $role['price'];
+            } elseif ($role['type'] == 2) {
+                $data['set_f_price'] = $data['set_price'] = Dever::load('area/api')->getPrice($role['area'], $area_string);
+            } else {
+                $data['set_f_price'] = $data['set_price'] = 0;
+            }
             
             $data['set_area'] = $area_string;
         }