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

learn/active/lib/Active.php

@@ -37,23 +37,22 @@ class Active
 				}
 			}
 		}
-		$data = Dever::db('active/order')->getNum(array('uid'=>$uid,'active_id'=>$active_id));
+		$order = Dever::db('active/order')->getNum(array('uid'=>$uid,'active_id'=>$active_id));
 		$member = Dever::db('agent/member')->find(array('mobile'=>$user['mobile']));
 		if ($member) {
 			foreach ($title as $k => $v) {
 				if($v['id'] == $member['role']) {
-					if ($data && $data['total']  && $v['num'] > 0 && $data['total'] > $v['num']) {
+					if ($order && $order['total']  && $v['num'] > 0 && $order['total'] > $v['num']) {
 						Dever::alert('您已超过限购数量');
 					}
 				}
 			}
 		}
-		if ($data && $data['total'] && $data['total'] > $data['num']) {
+		if ($order && $order['total'] && $order['total'] >= $data['num']) {
 			Dever::alert('您已超过限购数量');
 		}
 		$insert['order_num'] = $this->getOrderId();
 		$ids = Dever::db('active/order')->insert($insert);
-
 		$url = Dever::url();
 		$refer = 'https://www.churenyiliao.com/';
 		if (strstr($url, 'uat.')) {

learn/active/lib/Manage.php

@@ -261,7 +261,7 @@ Class Manage
             $user = Dever::db('active/user')->find($info['mid']);
             $info['uid'] = $user['id'];
         }
-        $code = Dever::db('active/code')->state(array('order_id' => $id, 'buy_uid'=>$info['uid']));
+        $code = Dever::db('active/code')->state(array('order_id' => $id));
         $use_code = count($code);
         $no_code = $info['num'] - $use_code;
         if ($info['mid'] && $info['mid'] > 0) {
@@ -335,7 +335,7 @@ Class Manage
             ),
         );
         if ($use_code > 0) {
-           $result +=  $this->table($id,$user['id']);
+           $result +=  $this->table($id);
             
         }
         $head = array
@@ -347,9 +347,9 @@ Class Manage
         return $html;
     }
 
-    private function table ($id,$uid) 
+    private function table ($id) 
     {
-        $data = Dever::db('active/code')->state(array('order_id' => $id, 'join_uid' => $uid));
+        $data = Dever::db('active/code')->state(array('order_id' => $id));
         if ($data) {
             $head = array('参加人信息', '核销码', '核销状态', '领取时间', '核销时间','核销人');
             $body = array();

learn/active/src/Off.php

@@ -18,8 +18,8 @@ Class Off extends Coreoff
 		return $data;
 	}
 
-	#核销列表信息
-	public function getList(){
+	#获取核销信息
+	public function getInfo(){
 		$code = Dever::input('code');
 		if (!$code) {
 			Dever::alert('手机号或核销码不存在');
@@ -38,34 +38,37 @@ Class Off extends Coreoff
 			$where['write_code'] = $code;
 			$data = Dever::db('active/code')->find($where);
 		}
+		$active = Dever::db('active/info')->find($where['active_id']);
 		if ($data) {
 			$user = Dever::db('active/user')->find($data['join_uid']);
 			$res['info']['code_id'] = $data['id'];
 			$res['info']['write_code'] = $data['write_code'];
+			$res['info']['active_name'] = $active['name'];
 			$res['info']['name'] = $user['name'];
 			$res['info']['mobile'] = $user['mobile'];
 			$parent_user = Dever::db('active/user')->find($data['buy_uid']);
 			$res['info']['parent_name'] = $parent_user['name'];
 			$res['info']['parent_mobile'] = $parent_user['mobile'];
+			$res['info']['avatar'] = $user['avatar'];
+			$res['info']['role_name'] = '';
+			$res['info']['title_name'] = '';
 			$member = Dever::db('agent/member')->find(array('mobile'=>$user['mobile']));
-			if (!$member) {
-				$res['member'] = array();
-			} else {
-				$res['member']['role_name'] = '';
-				$res['member']['title_name'] = '';
-				$res['member']['mobile'] = $member['mobile'];
+			if ($member) {
 				$role = Dever::db('setting/role')->find($member['role']);
 				$title = Dever::db('setting/title')->find($member['title_id']);
 				$level = Dever::db('setting/level')->find($member['level_id']);
 				if ($role) {
     				if (isset($level) && $level && isset($level['name']) && $level['name']){
-    					$res['member']['role_name'] = $role['name'] .'('.$level['name'].')';
+    					$res['info']['role_name'] = $role['name'] .'('.$level['name'].')';
     				} else {
-    					$res['member']['role_name'] = $role['name'];
+    					$res['info']['role_name'] = $role['name'];
     				}
     			}
     			if ($title  && $title['name']) {
-    				$res['member']['title_name'] = $title['name'];
+    				$res['info']['title_name'] = $title['name'];
+    			}
+    			if ($member['avatar']) {
+    				$res['info']['avatar'] = $member['avatar'];
     			}
 			}
 		} else {
@@ -74,7 +77,7 @@ Class Off extends Coreoff
 		return $res;
 	}
 	#确认核销
-	public function getConfirm()
+	public function confirm()
 	{
 		$code_id = Dever::input('code_id');
 		if (!$code_id) {