@@ -398,7 +398,7 @@ class Base
$convert = Dever::db('convert', 'connect')->select(array('connect_id' => $this->connect['id']));
$param = array();
- if ($convert) {
+ if ($convert && is_array($data)) {
if (isset($data[0])) {
foreach ($data as $k1 => $v1) {
foreach ($convert as $k => $v) {
@@ -120,6 +120,10 @@ return array
(
'notify_type' => 1,
),
+ 'notify_error' => array
+ (
+ 'notify_type' => 1,
+ ),
'connect/api_notify_code' => array
@@ -19,6 +19,7 @@ class Info
# 增加日志
public function log($seller_id, $order_id, $cash, $type = 3)
{
+ return;
$where['seller_id'] = $seller_id;
$where['order_id'] = $order_id;
$where['type'] = $type;
@@ -24,7 +24,8 @@ return array
//'yue',
'desc' => array
- 'name' => '操作备注/订单号',
+ //'name' => '操作备注/订单号',
+ 'name' => '操作备注',
'show' => '"{desc}" ? "{desc}" : ("{order_id}" ? Dever::load("manage", "seller")->showOrder("{order_id}") : "-")',
'cdate' => array
@@ -50,6 +51,7 @@ return array
'type',
//'desc',
+ /*
'order_id' => array
'name' => '最新订单号',
@@ -72,7 +74,7 @@ return array
'field' => 'id',
'key' => 'order_id',
- ),
+ ),*/
'name' => '时间',