|
@@ -151,7 +151,7 @@ class Order extends Core
|
|
|
|
|
|
if ($this->data['code']) {
|
|
|
foreach ($this->data['code'] as $k => $v) {
|
|
|
- $this->data['code'][$k]['code'] = 'M' . $v['id'];
|
|
|
+ $this->data['code'][$k]['code'] = Dever::load('code/lib/core')->view($v['id'], $v['create_uid']);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -285,13 +285,15 @@ class Order extends Core
|
|
|
|
|
|
$journal_id = Dever::input('journal_id', false, '> 0', '请传入正确的小刊ID');
|
|
|
|
|
|
- if (strstr($code, 'M')) {
|
|
|
- $code = str_replace('M', '', $code);
|
|
|
+ if (strpos($code, 'M') === 0) {
|
|
|
+ $code = substr($code, 5);
|
|
|
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);
|
|
|
+ $uid = substr($uid, 1, 4);
|
|
|
+ $uid = Dever::uid($uid, 'decode');
|
|
|
+ if ($info && $info['create_id'] != $uid) {
|
|
|
+ Dever::alert('请正确使用小刊兑换码');
|
|
|
+ }
|
|
|
} else {
|
|
|
$info = Dever::db('code/info')->one(array('code' => $code));
|
|
|
}
|