Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/lib/Order.php

@@ -1864,6 +1864,11 @@ class Order
                     $role = Dever::db('setting/role')->find($member['role']);
                     $shop = Dever::db('shop/info')->find($member_shop['new_shop_id']);
                     $shop_stat = '';
+                    $g_price = '';#归店业绩
+                    if ($v['role'] != 8) {
+                        $g_price = $v['price'];#归店业绩
+                    } 
+                    
                     if ($member['prize_type'] == 1 && $member['role'] == 8) {
                         $shop_stat = $v['price'];
                     }
@@ -1883,7 +1888,7 @@ class Order
                         $fdate,
                         $parent_member['name'],
                         $parent_member['mobile'],
-                        $v['price'],
+                        $g_price,
                         $shop['name'],
                         $shop['sid'],
                         $shop_stat,