edit

app/card/lib/Goods_set.php

@@ -116,6 +116,11 @@ class Goods_set
             }
         }
 
-        return 'reload';
+        $link = Dever::input('link');
+        if ($link) {
+            return $link;
+        } else {
+            return 'reload';
+        }
     }
 }

service/agent/lib/Manage.php

@@ -699,10 +699,18 @@ class Manage
                     $parent_goods = Dever::db('agent/member_goods')->getOne(array('id' => $t['parent_goods_id']));
                     if ($parent_goods && $parent_goods['num'] > 0) {
                         $parent_prize = Dever::db('setting/prize')->find($parent_goods['type_id']);
-                        $member = Dever::db('agent/member')->find($t['parent_mid']);
-                        if ($member) {
-                            $desc = $parent_prize['name'] . '名额使用';
-                            Dever::load('agent/lib/dhorder')->action($member, $parent_prize['name'], $parent_prize['num'], $parent_prize['price'], array(), -1, 2, 3, $parent_goods['type_id'], $desc);
+                        if ($parent_prize) {
+                            # 检测有没有名额权益
+                            $prize_goods = Dever::db('setting/prize_goods')->select(array('prize_id' => $parent_prize['id']));
+                            if ($prize_goods) {
+                                # 赠送权益
+                            }
+
+                            $member = Dever::db('agent/member')->find($t['parent_mid']);
+                            if ($member) {
+                                $desc = $parent_prize['name'] . '名额使用';
+                                Dever::load('agent/lib/dhorder')->action($member, $parent_prize['name'], $parent_prize['num'], $parent_prize['price'], array(), -1, 2, 3, $parent_goods['type_id'], $desc);
+                            }
                         }
                     }
                 }

service/agent/lib/Order.php

@@ -15,20 +15,20 @@ class Order
     {
         $member = array();
         $parent_mid = -1;
-    	if ($mid > 0) {
-    		$member = Dever::db('agent/member')->find($mid);
-    		if (!$member) {
-    			Dever::alert('代理商不存在');
-    		}
+        if ($mid > 0) {
+            $member = Dever::db('agent/member')->find($mid);
+            if (!$member) {
+                Dever::alert('代理商不存在');
+            }
             
-    		$mobile = $member['mobile'];
-    		$parent_mid = $member['parent_mid'];
+            $mobile = $member['mobile'];
+            $parent_mid = $member['parent_mid'];
             $data['mid'] = $member['id'];
-    		$data['type'] = $member['type'];
-	        $data['name'] = $member['name'];
-	        $data['idcard'] = $member['idcard'];
-	        $data['idcard_front'] = $member['idcard_front'];
-	        $data['idcard_back'] = $member['idcard_back'];
+            $data['type'] = $member['type'];
+            $data['name'] = $member['name'];
+            $data['idcard'] = $member['idcard'];
+            $data['idcard_front'] = $member['idcard_front'];
+            $data['idcard_back'] = $member['idcard_back'];
             $data['company_name'] = $member['company_name'];
             $data['company_pic'] = $member['company_pic'];
             $data['company_number'] = $member['company_number'];
@@ -41,14 +41,14 @@ class Order
                 }
             }
             
-    	} else {
-    		$mobile = Dever::input('mobile');
-	        $where['mobile'] = Dever::load('agent/lib/member')->checkMobile($mobile);
-	        $checkMember = Dever::db('agent/member')->find($where);
+        } else {
+            $mobile = Dever::input('mobile');
+            $where['mobile'] = Dever::load('agent/lib/member')->checkMobile($mobile);
+            $checkMember = Dever::db('agent/member')->find($where);
 
-	        if ($checkMember) {
-	            Dever::alert('注册失败，手机号已存在');
-	        }
+            if ($checkMember) {
+                Dever::alert('注册失败，手机号已存在');
+            }
 
             $code = Dever::input('code');
             if ($code) {
@@ -62,16 +62,16 @@ class Order
                 }
             }
 
-	        $data['type'] = Dever::input('type', 1);
-	        $data['name'] = Dever::input('name');
-	        $data['idcard'] = Dever::input('idcard');
-	        $data['idcard_front'] = Dever::input('idcard_front');
-	        $data['idcard_back'] = Dever::input('idcard_back');
+            $data['type'] = Dever::input('type', 1);
+            $data['name'] = Dever::input('name');
+            $data['idcard'] = Dever::input('idcard');
+            $data['idcard_front'] = Dever::input('idcard_front');
+            $data['idcard_back'] = Dever::input('idcard_back');
             $data['company_name'] = Dever::input('company_name');
             $data['company_pic'] = Dever::input('company_pic');
             $data['company_number'] = Dever::input('company_number');
             $data['source_id'] = Dever::input('source_id');
-    	}
+        }
         if($data['idcard']){
              $birth = strlen($data['idcard'])==15 ? ('19' . substr($data['idcard'], 6, 6)) : substr($data['idcard'], 6, 8);
              $year=substr($birth,0,4);#出生年份
@@ -96,7 +96,7 @@ class Order
             }
         }
         
-    	Dever::load('agent/lib/member')->checkMcode($mobile);
+        Dever::load('agent/lib/member')->checkMcode($mobile);
 
         $data['mobile'] = $mobile;
         $data['parent_mid'] = $parent_mid;
@@ -109,7 +109,7 @@ class Order
         }
 
         if ($data['type'] == 2) {
-        	if (!$data['company_name']) {
+            if (!$data['company_name']) {
                 Dever::alert('公司名称不能为空');
             }
             if (!$data['company_pic']) {
@@ -149,20 +149,20 @@ class Order
             }
             */
         } elseif ($data['pay_type'] == 3) {
-        	$data['bank_id'] = Dever::input('bank_id');
-        	if (!$data['bank_id']) {
-        		Dever::alert('请选择银行');
-        	}
-        	$data['bank_card'] = Dever::input('bank_card');
-        	if (!$data['bank_card']) {
-        		Dever::alert('请输入银行卡号');
-        	}
+            $data['bank_id'] = Dever::input('bank_id');
+            if (!$data['bank_id']) {
+                Dever::alert('请选择银行');
+            }
+            $data['bank_card'] = Dever::input('bank_card');
+            if (!$data['bank_card']) {
+                Dever::alert('请输入银行卡号');
+            }
         } else {
-        	# 汇款
-        	$data['pay_pic'] = Dever::input('pay_pic');
-        	if (!$data['pay_pic']) {
-        		Dever::alert('请上传打款凭证');
-        	}
+            # 汇款
+            $data['pay_pic'] = Dever::input('pay_pic');
+            if (!$data['pay_pic']) {
+                Dever::alert('请上传打款凭证');
+            }
             $data['pay_price'] = Dever::input('pay_price');
         }
 
@@ -172,7 +172,7 @@ class Order
 
         $info = Dever::db('agent/order')->find($where);
         if ($info && $info['status'] != 5) {
-        	//Dever::alert('请勿重复提交');
+            //Dever::alert('请勿重复提交');
         }
 
         $data['role'] = $where['role'];
@@ -189,24 +189,24 @@ class Order
             # 生成代理商
             $result = Dever::load('passport/reg')->getSign($data['mid']);
             $result['order_id'] = $data['id'];
-        	$result['msg'] = '您的申请已经提交完成，请耐心等待，我们将在工作日8小时内为您通过审核，非常感谢。';
+            $result['msg'] = '您的申请已经提交完成，请耐心等待，我们将在工作日8小时内为您通过审核，非常感谢。';
 
             $agreement = Dever::db('setting/agreement')->getData();
             list($temp, $result['agreement_1']) = Dever::load('agent/lib/agreement')->name($agreement[1], $data, $data['role'], 1, 2);
             list($temp, $result['agreement_4']) = Dever::load('agent/lib/agreement')->name($agreement[4], $data, $data['role'], 1, 2);
 
-        	if ($data['pay_type'] == 3) {
-        		$result['bank_msg'] = '您需要使用银行卡：所有人（'.$data['name'].'），账号（'.$data['bank_card'].'），转账至如下账户（'.$data['price_str'].'）:';
-        		$config = Dever::db('setting/base')->find();
-        		$result['bank_user'] = $config['bank_user'];
-        		$result['bank_name'] = $config['bank_name'];
-        		$result['bank_card'] = $config['bank_card'];
-        	} elseif ($data['pay_type'] == 1) {
-        		# 在线支付 生成支付信息
-        		$result['pay'] = $this->pay($data);
-        	}
-
-        	return $result;
+            if ($data['pay_type'] == 3) {
+                $result['bank_msg'] = '您需要使用银行卡：所有人（'.$data['name'].'），账号（'.$data['bank_card'].'），转账至如下账户（'.$data['price_str'].'）:';
+                $config = Dever::db('setting/base')->find();
+                $result['bank_user'] = $config['bank_user'];
+                $result['bank_name'] = $config['bank_name'];
+                $result['bank_card'] = $config['bank_card'];
+            } elseif ($data['pay_type'] == 1) {
+                # 在线支付 生成支付信息
+                $result['pay'] = $this->pay($data);
+            }
+
+            return $result;
         } else {
             Dever::alert('登录失败');
         }
@@ -341,13 +341,13 @@ class Order
             $member = Dever::db('agent/member')->find($member);
         }
         
-    	$data['role'] = Dever::input('role');
+        $data['role'] = Dever::input('role');
         if (!$data['role']) {
             Dever::alert('代理类型不能为空');
         }
         $data['role'] = Dever::db('setting/role')->find($data['role']);
         if (!$data['role']) {
-        	Dever::alert('代理类型不正确');
+            Dever::alert('代理类型不正确');
         }
         if ($data['role']['isbuy'] != 1) {
             Dever::alert('代理类型不正确');
@@ -363,15 +363,15 @@ class Order
 
         # 计算支付金额
         if ($data['role']['type'] == 1) {
-        	$data['price'] = $data['role']['price'];
+            $data['price'] = $data['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('代理区域的代理价格为空，请联系客服');
-        	}
+            $data['price'] = Dever::load('area/api')->getPrice($data['role']['area'], $data['area']);
+            if ($data['price'] <= 0) {
+                Dever::alert('代理区域的代理价格为空，请联系客服');
+            }
         } else {
-        	Dever::alert('代理类型不正确');
+            Dever::alert('代理类型不正确');
         }
 
         $data['order_type'] = 1;
@@ -970,7 +970,7 @@ class Order
                 }
 
                 # 检测有没有名额，如果有，直接使用名额内的佣金比例和权益
-                if ($role['id'] == 6 || $role['id'] == 8) {
+                if ($role['type'] == 1) {
                     $parent_goods = Dever::db('agent/member_goods')->getAll(array('mid' => $v['uid'], 'type' => 3));
                     if ($parent_goods) {
                         foreach ($parent_goods as $vg) {
@@ -983,7 +983,22 @@ class Order
                                     # 检测有没有名额权益 待加
                                     $prize_goods = Dever::db('setting/prize_goods')->select(array('prize_id' => $parent_prize['id']));
                                     if ($prize_goods) {
-
+                                        foreach ($prize_goods as $pk => $pv) {
+                                            if ($pv['type'] == 1) {
+                                                $goods_info = Dever::load('goods/lib/info')->getInfoBySku($pv['type_id'], $pv['sku_id']);
+                                                if (isset($goods_info['sku'])) {
+                                                    $sku = '-' . $goods_info['sku']['string'];
+                                                } else {
+                                                    $sku = '';
+                                                }
+                                                $prize_goods[$pk]['name'] = $goods_info['name'] . $sku;
+                                            } elseif ($pv['type'] == 2) {
+                                                $card = Dever::db('card/info')->find($pv['type_id']);
+                                                $pv['price'] = round($info['price']*($pv['num']/100), 2);
+                                                $prize_goods[$pk]['name'] = $pv['price'] . '元' . $card['name'];
+                                                $prize_goods[$pk]['num'] = $pv['num'] . '%';
+                                            }
+                                        }
                                     }
 
                                     break;
@@ -1055,8 +1070,10 @@ class Order
         if (isset($prize) && $prize) {
             $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
         }
-        if (isset($card)) {
-            $parent_name .= '&nbsp;&nbsp;赠送权益：'.$card['name'];
+        if (isset($prize_goods)) {
+            foreach ($prize_goods as $pv) {
+                $table['body'][] = array('赠送权益', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $pv['num'], $pv['name']);
+            }
         }
 
         return $parent_name;