xiaoyu 3 лет назад
Родитель
Сommit
11c9e0e56c
2 измененных файлов с 11 добавлено и 4 удалено
  1. 3 3
      admin/control/refill_order_manual.php
  2. 8 1
      data/model/refill_buyback.model.php

+ 3 - 3
admin/control/refill_order_manual.php

@@ -120,7 +120,7 @@ class refill_order_manualControl extends SystemControl
             $order_ids = $this->unique_array($order_ids);
 
             $refill_buyback_model = Model('refill_buyback');
-            $buybacks = $refill_buyback_model->getList(['order_id' => ['in',$order_ids], 'manual_type' => 'buyback']);
+            $buybacks = $refill_buyback_model->getBuyBackList(['order_id' => ['in',$order_ids], 'manual_type' => 'buyback']);
             $buyback_ids = array_column($buybacks, 'order_id');
             $buyback_ids = $this->int_array($buyback_ids);
             $buyback_ids = $this->unique_array($buyback_ids);
@@ -203,7 +203,7 @@ class refill_order_manualControl extends SystemControl
         $bz = empty($bz) ? '' : $bz;
 
         $buyback_ids = function ($order_ids,$oper_type){
-            $buybacks = Model('refill_buyback')->getList(['order_id' => ['in',$order_ids], 'manual_type' => $oper_type]);
+            $buybacks = Model('refill_buyback')->getBuyBackList(['order_id' => ['in',$order_ids], 'manual_type' => $oper_type]);
             $buyback_ids = array_column($buybacks, 'order_id');
             $buyback_ids = $this->int_array($buyback_ids);
             return $this->unique_array($buyback_ids);
@@ -239,7 +239,7 @@ class refill_order_manualControl extends SystemControl
             try
             {
                 $trans = new trans_wapper($refill_buyback_model, __METHOD__);
-
+                $refill_buyback_model->getOrder(['order_id' => $order_id, 'manual_type' => $oper_type], '*', true, true);
                 if ($oper_type == 'buyback') {
                     $mchid = $order['mchid'];
                     $merchant_info = $merchants[$mchid];

+ 8 - 1
data/model/refill_buyback.model.php

@@ -9,10 +9,17 @@ class refill_buybackModel extends Model
         parent::__construct('refill_buyback');
     }
 
-    public function getList($condition, $pagesize = '', $field = '*', $order = 'order_time desc', $limit = '', $master = false)
+    public function getBuyBackList($condition, $pagesize = '', $field = '*', $order = 'order_time desc', $limit = '', $master = false)
     {
         $list = $this->field($field)->where($condition)->page($pagesize)->order($order)->limit($limit)->master($master)->select();
         if (empty($list)) return [];
         return $list;
     }
+
+    public function getOrder($condition = [], $fields = '*', $master = false,$lock=false)
+    {
+        $order_info = $this->field($fields)->where($condition)->master($master)->lock($lock)->find();
+        if (empty($order_info)) return [];
+        return $order_info;
+    }
 }