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

learn/active/database/code.php

@@ -235,6 +235,20 @@ return array
             'order' => array('cdate' => 'desc'),
             'col' => '*',
         ),
+        'getOne' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'join_uid' => 'yes',
+                'active_id' =>'yes',
+                'status' => array('yes','in'),
+                'state' => 1,
+            ),
+            'type' => 'one',
+            // 'order' => array('cdate' => 'desc'),
+            'col' => '*',
+        ),
         'getCode' => array
         (
             # 匹配的正则或函数 选填项

learn/active/src/Home.php

@@ -126,8 +126,16 @@ Class Home extends Core
 		}
 		if ($uid) {
 			$user = Dever::db('active/user')->find($uid);
+			$member = Dever::load('active/lib/user')->agent($user);
 			$where['where_id'] = $uid;
-			$where['name'] = $data['name'];
+			if ($member) {
+				if ($data['name'] != $member['name']) {
+					$where['name'] = $member['name'];
+				}
+			} else {
+				$where['name'] = $data['name'];
+			}
+			
 			if (!$user['idcard'] && $data['idcard']) {
 				$where['idcard'] = $data['idcard'];
 			}
@@ -226,13 +234,13 @@ Class Home extends Core
         if ($data['info']['num'] <= count($code)) {
             Dever::alert('已领完');
         } else {
-            $where['active_id'] = $active_id;
-            $where['join_uid'] = $uid;
-            
-            $code = Dever::db('active/code')->find($where);
+           
+            $code = Dever::db('active/code')->getOne(array('active_id'=>$active_id,'join_uid'=>$uid,'status'=>'1,2'));
             if ($code) {
                 Dever::alert('您已领取过了，不可重复领取');
             }
+            $where['active_id'] = $active_id;
+            $where['join_uid'] = $uid;
             $where['buy_uid'] = $data['info']['uid'];
             $where['order_id'] = $order_id;
             $where['act_status'] = $info['act_status'];