|
@@ -119,10 +119,14 @@ class Order
|
|
|
$selected[$v['channel_id']] = true;
|
|
|
}
|
|
|
}
|
|
|
- $order_error = $this->channel_update($info, $channel, $result);
|
|
|
- $order_error['order_num'] = $info['order_num'];
|
|
|
- Dever::db('order_error', 'seller')->insert($order_error);
|
|
|
- return $this->handleAct($info, $selected);
|
|
|
+ $num = count($selected);
|
|
|
+ $channel_num = $channel_num - $num;
|
|
|
+ if ($channel_num > 0) {
|
|
|
+ $order_error = $this->channel_update($info, $channel, $result);
|
|
|
+ $order_error['order_num'] = $info['order_num'];
|
|
|
+ Dever::db('order_error', 'seller')->insert($order_error);
|
|
|
+ return $this->handleAct($info, $selected);
|
|
|
+ }
|
|
|
}
|
|
|
} elseif ($channel['type'] == 2) {
|
|
|
|
|
@@ -293,20 +297,24 @@ class Order
|
|
|
$selected[$v['channel_id']] = true;
|
|
|
}
|
|
|
}
|
|
|
- $order_error = array();
|
|
|
- $order_error['order_num'] = $info['order_num'];
|
|
|
- $order_error['buy_price'] = $info['buy_price'];
|
|
|
- $order_error['channel_id'] = $info['channel_id'];
|
|
|
- $order_error['channel_goods_id'] = $info['channel_goods_id'];
|
|
|
- $order_error['channel_goods_discount'] = $info['channel_goods_discount'];
|
|
|
- $order_error['channel_order_date'] = $info['channel_order_date'];
|
|
|
- $order_error['channel_order_num'] = $info['channel_order_num'];
|
|
|
- $order_error['channel_request'] = $info['channel_request'];
|
|
|
- $order_error['channel_response'] = $info['channel_response'];
|
|
|
- $order_error['channel_callback'] = $info['channel_callback'];
|
|
|
- $order_error['channel_callback_date'] = time();
|
|
|
- Dever::db('order_error', 'seller')->insert($order_error);
|
|
|
- return Dever::load('order', 'seller')->handleAct($info, $selected);
|
|
|
+ $num = count($selected);
|
|
|
+ $channel_num = $channel_num - $num;
|
|
|
+ if ($channel_num > 0) {
|
|
|
+ $order_error = array();
|
|
|
+ $order_error['order_num'] = $info['order_num'];
|
|
|
+ $order_error['buy_price'] = $info['buy_price'];
|
|
|
+ $order_error['channel_id'] = $info['channel_id'];
|
|
|
+ $order_error['channel_goods_id'] = $info['channel_goods_id'];
|
|
|
+ $order_error['channel_goods_discount'] = $info['channel_goods_discount'];
|
|
|
+ $order_error['channel_order_date'] = $info['channel_order_date'];
|
|
|
+ $order_error['channel_order_num'] = $info['channel_order_num'];
|
|
|
+ $order_error['channel_request'] = $info['channel_request'];
|
|
|
+ $order_error['channel_response'] = $info['channel_response'];
|
|
|
+ $order_error['channel_callback'] = $info['channel_callback'];
|
|
|
+ $order_error['channel_callback_date'] = time();
|
|
|
+ Dever::db('order_error', 'seller')->insert($order_error);
|
|
|
+ return Dever::load('order', 'seller')->handleAct($info, $selected);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|