|
@@ -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];
|