|
|
@@ -768,11 +768,10 @@ class memberModel extends Model
|
|
|
}
|
|
|
|
|
|
// 预存款订单查询条件
|
|
|
- $condition = 'lg_freeze_amount=0.0 and lg_av_amount<0.0 and lg_member_name=\'' . $member_info['member_name'] . '\'';
|
|
|
+ $condition = 'lg_freeze_amount<>0.0 or lg_av_amount<0.0 and lg_member_name=\'' . $member_info['member_name'] . '\'';
|
|
|
|
|
|
$model_pd = Model('predeposit');
|
|
|
$tmp_log_list = array();
|
|
|
- //$pd_log_list =$this->getPdLogList($condition,20,'*','lg_id desc');
|
|
|
$pd_log_list = $model_pd->getPdLogList($condition,'','*','lg_id desc');
|
|
|
|
|
|
// 订单数据查询条件(只查询已完成订单), 生成订单查询语句, 在详细查询阶段进行批量查询
|
|
|
@@ -798,7 +797,6 @@ class memberModel extends Model
|
|
|
// 查询订单详细数据
|
|
|
$condition_order .= ")";
|
|
|
$model_order = Model('order');
|
|
|
- //$order_list = $model_order->getOrderList($condition_order, 20, '*', 'order_id desc','', array('order_common','order_goods','store'));
|
|
|
$order_list = $model_order->getOrderList($condition_order, '', '*', 'order_id desc','', array('order_common','order_goods','store'));
|
|
|
|
|
|
// 订单列表处理
|
songjiyuan