rabin 2 years ago
parent
commit
091f7f5131
2 changed files with 10 additions and 7 deletions
  1. 1 1
      service/agent/lib/Import.php
  2. 9 6
      service/agent/lib/Order.php

+ 1 - 1
service/agent/lib/Import.php

@@ -291,7 +291,7 @@ class Import
 
                         $mc_member = $this->db->fetch('select * from ims_mc_members where uid = ' . $v['uid']);
                         $data['rdate'] = $v['agenttime'];
-                        $data['cash'] = ($mc_member && $mc_member['credit2']) ? $mc_member['credit2'] : $v['credit2'];
+                        //$data['cash'] = ($mc_member && $mc_member['credit2']) ? $mc_member['credit2'] : $v['credit2'];
                         if ($this->state == 1) {
                             $data['group_sell'] = $v['allcommission'];
                         }

+ 9 - 6
service/agent/lib/Order.php

@@ -586,12 +586,6 @@ class Order
         $result['账号信息']['content'][] = array('身份证照片', $idcard_pic);
         $result['账号信息']['content'][] = array('代理商签名', $sign_pic);
 
-        if ($info['parent_mid'] && $info['parent_mid'] > 0) {
-            $parent = Dever::db('agent/member')->one($info['parent_mid']);
-            if ($parent) {
-                $result['上级信息'] = Dever::load('agent/lib/member')->getShowInfo($parent);
-            }
-        }
 
         $result['支付信息'] = array
         (
@@ -613,6 +607,15 @@ class Order
                 array('支付凭证', $pay_pic),
             ),
         );
+        
+        if ($info['parent_mid'] && $info['parent_mid'] > 0) {
+            $parent = Dever::db('agent/member')->one($info['parent_mid']);
+            if ($parent) {
+                $result['上级信息'] = Dever::load('agent/lib/member')->getShowInfo($parent);
+            }
+        }
+
+        
 
         $button = $this->show_button($process, $info, $role, $parent_member);