pengchanglu 3 yıl önce
ebeveyn
işleme
10765cc70e

+ 1 - 1
application/admin/controller/pig/Code.php

@@ -18,7 +18,7 @@ class Code extends Backend
      */
     protected $model = null;
     protected $dataLimit = 'auth';
-    protected $searchFields = ['orderid'];
+    protected $searchFields = ['id','orderid'];
 
     public function _initialize()
     {

+ 4 - 1
application/admin/controller/pig/Order.php

@@ -99,7 +99,7 @@ class Order extends Backend
                     $params['orderid'] = 's'. date("YmdHis") . mt_rand(100, 999);
                     
                     //绑定码
-                    $list = Db::query('SELECT id FROM `pi_p_code` WHERE `admin_id` = '.$this->auth->id.' AND `orderid` = \'\' ORDER BY `id` ASC LIMIT 0,'.$params['num'].'; ');
+                    $list = Db::query('SELECT id FROM `pi_p_code` WHERE `admin_id` = '.$this->auth->id.' AND `orderid` = \'\'  AND  `deletetime` IS NULL ORDER BY `id` ASC LIMIT 0,'.$params['num'].'; ');
 
                     //$list = Db::query('SELECT id FROM `pi_p_code` WHERE `admin_id` = 4 AND `orderid` = \'\' ORDER BY `id` ASC LIMIT 0,'.$params['num'].'; ');
                     if (!$list) {
@@ -110,7 +110,9 @@ class Order extends Backend
                     $step = 0;
                     $sql = 'UPDATE `pi_p_code` SET `orderid` = \''.$params['orderid'].'\'  WHERE `id` IN (' ;
 
+                    $num = 0;//个数
                     foreach ($list as $k => $v) {
+                        $num++;
                         $sql .= $v['id'].',';
                         if ($k>0) {
                             if ($list[$k-1]['id']+1 != $list[$k]['id']) {
@@ -136,6 +138,7 @@ class Order extends Backend
                         $params['code'] = $str.$list[count($list)-1]['id'];
                     }
                     
+                    $params['num'] = $num;
                     $result = $this->model->allowField(true)->save($params);
                     Db::commit();
                 } catch (ValidateException $e) {