dever hace 6 años
padre
commit
30e38d4986
Se han modificado 3 ficheros con 25 adiciones y 5 borrados
  1. 9 4
      act/src/Order.php
  2. 1 1
      code/database/info.php
  3. 15 0
      code/lib/Manage.php

+ 9 - 4
act/src/Order.php

@@ -110,7 +110,7 @@ class Order extends Core
 
 
         if ($this->data['code']) {
         if ($this->data['code']) {
             foreach ($this->data['code'] as $k => $v) {
             foreach ($this->data['code'] as $k => $v) {
-                $this->data['code'][$k]['code'] = $v['id'];
+                $this->data['code'][$k]['code'] = 'M' . $v['id'];
             }
             }
         }
         }
 
 
@@ -242,12 +242,17 @@ class Order extends Core
 
 
             $journal_id = Dever::input('journal_id', $journal_id, '> 0', '请传入正确的小刊ID');
             $journal_id = Dever::input('journal_id', $journal_id, '> 0', '请传入正确的小刊ID');
 
 
-            if (!strstr($code, 'T')) {
+            if (strstr($code, 'M')) {
+                $code = str_replace('M', '', $code);
                 Dever::setInput('set_product_id', $journal_id);
                 Dever::setInput('set_product_id', $journal_id);
+                $info = Dever::db('code/info')->one($code);
+            } elseif (strstr($code, 'T')) {
+                $code = str_replace('T', '', $code);
+                $info = Dever::db('code/info')->one($code);
+            } else {
+                $info = Dever::db('code/info')->one(array('code' => $code));
             }
             }
 
 
-            $info = Dever::db('code/info')->one(array('code' => $code));
-
             if (!$info) {
             if (!$info) {
                 Dever::alert('兑换码不存在');
                 Dever::alert('兑换码不存在');
             }
             }

+ 1 - 1
code/database/info.php

@@ -140,7 +140,7 @@ return array
 			'match' 	=> 'is_string',
 			'match' 	=> 'is_string',
 			'update'	=> 'text',
 			'update'	=> 'text',
 			'search'	=> 'fulltext',
 			'search'	=> 'fulltext',
-			'list'		=> '{create_uid} > 0 ? "用户创建" : ({product_id} > 0 ? "{id}" : "T{id}")',
+			'list'		=> 'Dever::load("code/lib/manage.showCode", "{id}")',
 			//'list'		=> true,
 			//'list'		=> true,
 		),
 		),
 
 

+ 15 - 0
code/lib/Manage.php

@@ -6,6 +6,21 @@ use Dever;
 
 
 class Manage
 class Manage
 {
 {
+	public function showCode($id)
+	{
+		$info = Dever::db('code/info')->one($id);
+
+		if ($info['create_uid'] > 0) {
+			return '用户创建';
+		}
+
+		if ($info['product_id'] > 0) {
+			return $id;
+		}
+
+		return 'T' . $id;
+	}
+
 	/**
 	/**
 	 * 显示用户信息
 	 * 显示用户信息
 	 *
 	 *