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

learn/active/database/info.php

@@ -81,7 +81,7 @@ return array
             'key'       => '1',
             // 'place'     => '759*562',
         ),
-
+        
         'desc'      => array
         (
             'type'      => 'varchar-500',

learn/active/database/order.php

@@ -149,6 +149,18 @@ return array
 	        'update'    => 'textarea',
 	    ),
 
+	    'url'      => array
+        (
+            'type'      => 'varchar-300',
+            'name'      => '支付链接',
+            'default'   => '',
+            'desc'      => '支付链接',
+            'match'     => 'is_string',
+            // 'update'    => 'fulltext',
+            //'search'    => 'fulltext',
+            //'list'      => true,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

learn/active/src/Api.php

@@ -61,6 +61,9 @@ Class Api extends Core {
 	        );
 
 	        $result = Dever::load('pay/api.pay', $param);
+	        if($result['order']){
+	        	Dever::db('active/order')->update(array('where_id'=>$ids,'url'=>$result['order']));
+	        }
 	        $result['order_num'] = $info['order_num'];
 	        $result['order_id'] = $info['id'];
 	        $jump = Dever::input('jump');
@@ -118,39 +121,18 @@ Class Api extends Core {
     	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;
+    	$time = time();
+    	if ($time-$order['cdata']>300){
+    		Dever::alert('订单已关闭');
+    	}
         $jump = Dever::input('jump');
         if ($jump == 1) {
-        	Dever::location($result['order']);
+        	Dever::location($order['url']);
         }
-        return $result;
+        return $order;
     }
     #定时
     public function job(){