dever 6 years ago
parent
commit
b09f771294
4 changed files with 26 additions and 7 deletions
  1. 10 0
      act/src/Order.php
  2. 11 4
      code/database/info.php
  3. 4 0
      code/lib/Core.php
  4. 1 3
      code/lib/Manage.php

+ 10 - 0
act/src/Order.php

@@ -102,6 +102,12 @@ class Order extends Core
 
         $this->data['code'] = Dever::db('code/info')->getMyAll($where);
 
+        if ($this->data['code']) {
+            foreach ($this->data['code'] as $k => $v) {
+                $this->data['code'][$k]['code'] = $v['id'];
+            }
+        }
+
         return $this->data;
     }
 
@@ -230,6 +236,10 @@ class Order extends Core
 
             $journal_id = Dever::input('journal_id', $journal_id, '> 0', '请传入正确的小刊ID');
 
+            if (!strstr($code, 'T')) {
+                Dever::setInput('set_product_id', $journal_id);
+            }
+
             $info = Dever::db('code/info')->one(array('code' => $code));
 
             if (!$info) {

+ 11 - 4
code/database/info.php

@@ -40,8 +40,14 @@ $cate = function() use ($auth)
 };
 
 $name = 'info';
-$create = true;
-$product_id = Dever::input('set_product_id');
+$create = Dever::config('database')->create;
+$data = Dever::input('search_linkage_product');
+if (isset($data[1])) {
+	$product_id = $data[1];
+} else {
+	$product_id = Dever::input('set_product_id');
+}
+
 if ($product_id && $product_id > 0) {
 	$name .= '_' . $product_id;
 	$create = false;
@@ -56,6 +62,7 @@ return array
 	'menu' => 'journal',
 	'order' => 1,
 	'create' => $create,
+	'auto' => 10000000,
 	# 数据结构
 	'struct' => array
 	(
@@ -133,8 +140,8 @@ return array
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
 			'search'	=> 'fulltext',
-			'list'		=> '{create_uid} > 0 ? "用户创建" : "{code}"',
-			'list'		=> true,
+			'list'		=> '{create_uid} > 0 ? "用户创建" : "T{id}"',
+			//'list'		=> true,
 		),
 
 		'score'         => array

+ 4 - 0
code/lib/Core.php

@@ -49,6 +49,10 @@ class Core
 
 	public function createCode($product, $cate_id, $product_id, $seller_id, $product_num = 0, $create_uid = -1, $order_id = false, $score = 0, $type = 1, $num = 1)
 	{
+        if ($product_id > 0) {
+            Dever::setInput('set_product_id', $product_id);
+        }
+        
 		//$data['product'] = $product;
 		$data['cate_id'] = $cate_id;
 		$data['product_id'] = $product_id;

+ 1 - 3
code/lib/Manage.php

@@ -65,9 +65,7 @@ class Manage
 		if ($code > 0 && $code > $total) {
 			$num = $code - $total;
 
-			for ($i = 0; $i < $num; $i++) {
-				$core->createCode($product, $cate_id, $product_id, $seller_id, $product_num, -1, false, $score);
-			}
+			$core->createCode($product, $cate_id, $product_id, $seller_id, $product_num, -1, false, $score, 1, $num);
 		}
 	}