edit

learn/active/database/order.php

@@ -139,6 +139,16 @@ return array
             'list'      => true,
         ),
 
+        'remark'      => array
+	    (
+	        'type'      => 'varchar-300',
+	        'name'      => '订单备注',
+	        'default'   => '',
+	        'desc'      => '订单备注',
+	        'match'     => 'option',
+	        'update'    => 'textarea',
+	    ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -196,6 +206,7 @@ return array
             'option' => array
             (
                 'mid' => 'yes',
+                'status' => array('yes','!='),
                 'state' => 1,
             ),
             'type' => 'all',

learn/active/src/Api.php

@@ -25,11 +25,15 @@ Class Api extends Core {
 		if(!$num){
 			Dever::alert('购买数量不能为空');
 		}
+		$remark = Dever::input('remark');
 		$data = Dever::db('active/info')->find($id);
 		$insert['active_id'] = $id;
 		$insert['mid'] = $this->uid;
 		$insert['num'] = $num;
 		$insert['price'] = $num * $data['price'];
+		if($remark){
+			$insert['remark'] = $remark;
+		}
 		$data = Dever::db('active/order')->getNum(array('mid'=>$this->uid,'active_id'=>$id));
 		// if($data && $data['total'] && $data['tatal'] > $data['num']){
 		// 	Dever::alert('您已超过限购数量');
@@ -106,6 +110,44 @@ Class Api extends Core {
 
         return 'ok';
     }
+    #再次发起支付
+    public function rpay(){
+    	$id = Dever::input('id');#订单的id
+    	$order = Dever::db('active/order')->find($id);
+
+    	if (!$order) {
+    		Dever::alert('订单信息错误');
+    	}
+    	if ($order && $order['active_id'] && $order['active_id']>0) {
+    		$active = Dever::db('active/info')->find($order['active_id']);
+    	}else{
+    		Dever::alert('此活动已关闭');
+    	}
+    	
+    	if ($order['status'] > 1) {
+    		Dever::alert('订单已支付或已取消');
+    	}
+
+    	$param = array
+        (
+            'project_id' => 6,
+            'channel_id' => 1,
+            'system_source' => 1,
+            'account_id' => 8,
+            'uid' => $order['mid'],
+            'name' => $active['name'],
+            'cash' => $order['price'],
+            'product_id' => $id,
+            'order_id' => $order['order_num'],
+            'refer' => Dever::input('refer', 'http://guanli.uat.churenyiliao.com/data/payback/payback.html'),,
+        );
+
+        $result = Dever::load('pay/api.pay', $param);
+        $result['order_price'] = $order['price'];
+        $result['order_num'] = $order['order_num'];
+        $result['order_id'] = $id;
+        return $result;
+    }
     #定时
     public function job(){
     	$data = Dever::db('active/order')->state(array('status'=>1));
@@ -121,15 +163,32 @@ Class Api extends Core {
     }
 	#门票列表
 	public function getList(){
-		$data['user'] = $this->user;
-		$data['list'] = Dever::db('active/order')->getAll(array('mid'=>$this->uid));
+		$data['list'] = Dever::db('active/order')->getAll(array('mid'=>$this->uid,'status'=>3));
 		foreach($data['list'] as $k => $v){
 			$active = Dever::db('active/info')->find($v['active_id']);
 			$data['list'][$k]['active_name'] = $active['name'];
 			$data['list'][$k]['cdate'] = date('Y-m-d H:i',$v['cdate']);
 			$config = Dever::db('active/order')->config['config_status'];
 			$data['list'][$k]['status_name'] = Dever::status($config,$v['status']);
-
+		}
+		return $data;
+	}
+	#详情页
+	public function getDesc(){
+		$id = Dever::input('id');
+		$data['user'] = $this->user;
+		$data['list'] = Dever::db('active/order')->find($id);
+		if($data['list']){
+			$active = Dever::db('active/info')->find($data['list']['active_id']);
+			$data['list']['active_name'] = $active['name'];
+			$data['list']['cash'] = $active['price'];#单价
+			$data['list']['cdate'] = date('Y-m-d H:i',$data['list']['cdate']);
+			$config = Dever::db('active/order')->config['config_status'];
+			$data['list']['status_name'] = Dever::status($config,$data['list']['status']);
+			$data['list']['refund_cash'] = '';#全额退款金额
+			if($data['list']['status'] == 6){
+				$data['list']['refund_cash'] = $data['list']['price'];
+			}
 		}
 		return $data;
 	}