dev

admin/control/ordersendlist.php

@@ -725,7 +725,7 @@ class ordersendlistControl extends SystemControl
 
     public function order_exceptionOp()
     {
-        $mod = Model('refill_exception');
+        $mod_except = Model('refill_exception');
         $cond['exc_state'] = 0;
 
         if (!empty($_GET['order_sns'])) {
@@ -735,7 +735,7 @@ class ordersendlistControl extends SystemControl
         if(in_array($_GET['exc_state'], ['0', '1'])) {
             $cond['exc_state'] = $_GET['exc_state'];
         }
-        $list = $mod->getRefillExceptionList($cond);
+        $list = $mod_except->getExceptionList($cond);
 
         $merchant_list = $this->merchants();
         foreach ($merchant_list as  $value) {
@@ -743,7 +743,7 @@ class ordersendlistControl extends SystemControl
         }
         Tpl::output('merchant_list', $merchants);
         Tpl::output('list', $list);
-        Tpl::output('show_page', $mod->showpage());
+        Tpl::output('show_page', $mod_except->showpage());
         Tpl::showpage('refill.order.exception');
     }
 
@@ -751,11 +751,13 @@ class ordersendlistControl extends SystemControl
     {
         $exc_ids = $_GET['exc_ids'];
         $exc_ids = explode(',', $exc_ids);
+
         $cond['exc_id'] = ['in',$exc_ids];
         $cond['exc_state'] = 0;
-        $mod = Model('refill_exception');
-        $order_exceptions = $mod->getRefillExceptionList($cond);
-        if(empty($order_exceptions)) {
+        $mod_except = Model('refill_exception');
+
+        $excepts = $mod_except->getExceptionList($cond);
+        if(empty($excepts)) {
             showMessage('操作完成');
         }
 
@@ -763,11 +765,9 @@ class ordersendlistControl extends SystemControl
         $update['admin_id'] = $admininfo['id'];
         $update['admin_name'] = $admininfo['name'];
         $update['update_time'] = time();
-        foreach ($order_exceptions as $order_exception)
-        {
-
-            $exc_id = $order_exception['exc_id'];
-            $mod->ExceptionHandled($exc_id, $update);
+        foreach ($excepts as $except) {
+            $exc_id = $except['exc_id'];
+            $mod_except->setHandled($exc_id, $update);
         }
         showMessage('操作完成');
     }

data/logic/queue.logic.php

@@ -1461,6 +1461,10 @@ class queueLogic
     {
         $store_id = intval($params['store_id']);
         $channel_name = $params['channel_name'];
+        $order_sn = $params['order_sn'];
+        $order_id = intval($params['order_id']);
+
+
 
         if($store_id <= 0 || empty($channel_name)) {
             return callback(false, 'OnRiskSN 参数有空');

data/model/refill_exception.model.php

@@ -9,14 +9,14 @@ class refill_exceptionModel extends Model
         parent::__construct('refill_exception');
     }
 
-    public function getRefillExceptionList($condition, $pagesize = '',$total = 0, $field = '*', $order = 'create_time desc', $limit = '', $master = false)
+    public function getExceptionList($condition, $pagesize = '',$total = 0, $field = '*', $order = 'create_time desc', $limit = '', $master = false)
     {
         $list = $this->field($field)->where($condition)->page($pagesize,$total)->order($order)->limit($limit)->master($master)->select();
         if (empty($list)) return [];
         return $list;
     }
 
-    public function ExceptionHandled($exc_id, $update)
+    public function setHandled($exc_id, $update)
     {
         $update['exc_state'] = 1;
         return $this->where(['exc_id' => $exc_id])->update($update);