Commit 5f34ac6f authored by 蒋林's avatar 蒋林

Merge branch 'dev'

parents 78b577b6 38adbe41
......@@ -48,7 +48,7 @@ class Galanz extends BaseController
self::$receiveGalanzObj->CheckGetOrderDetailValues();
$values = self::$receiveGalanzObj->GetValues();
$this->saveLog('', 'getOrderDetail', $param);
$this->saveLog($values['out_trade_no'], 'getOrderDetail', $param);
$this->load->model('galanz_model');
$info = $this->galanz_model->infoByNewName($values['out_trade_no']);
......
......@@ -20,6 +20,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class Galanz extends BaseController
{
public function __construct()
{
parent::__construct();
}
/**
* 定时抓取订单数据
*/
......@@ -31,23 +36,19 @@ class Galanz extends BaseController
$account = $this->config->item('account');
$galanzAccount = $account['galanz'];
$this->load->model('order_log_model');
$orders = [];
foreach ($galanzAccount as $v) {
$orders = $this->galanzHandle($v);
//添加订单入库日志
if ($orders) {
foreach ($orders as $vv) {
$this->order_log_model->add($vv['new_name'], 'galanz', $vv, $v['username']);
}
}
$orders[] = $this->galanzHandle($v);
}
echo "<br/>";
print_r($orders);
}
private function galanzHandle($account)
{
$this->load->model('galanz_model');
$this->load->model('order_log_model');
$this->load->library('Source/SourceGalanz', $account, 'SourceGalanz');
//调取最近的数据
......@@ -82,6 +83,9 @@ class Galanz extends BaseController
//记录插入的订单
$order['id'] = $id;
$result[] = $order;
//添加订单入库日志
$this->order_log_model->add($order['new_name'], 'galanz', $order, $order['username']);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment