Commit 965073dd authored by zw's avatar zw

name

parent 076bc6c6
......@@ -1149,7 +1149,7 @@ class OrderLogService
/**
* @param $params 0.客户电话 1.客户姓名,去掉 2.报备人电话 3.报备人姓名 4.商铺名称 5.商铺地址 6客户编号 7商铺编号
* @param $params 0.客户电话 1.客户姓名,去掉 2.报备人电话 3.报备人姓名 4.商铺名称 5.商铺地址 6客户编号 7商铺编号 8订单id
* @param $pageNo
* @param $pageSize
* @return mixed
......@@ -1181,8 +1181,7 @@ class OrderLogService
$condition .= "and a.house_title like '%" . trim($params['search_keyword']) . "%' ";
break;
case 5:
//todo 列表没有显示商铺地址 和产品沟通暂时搁置
//$condition["c.house_title"] = array( 'like', "%" . trim($params['search_keyword']) . "%" );
$condition .= "and c.internal_address like '%" . trim($params['search_keyword']) . "%' ";
break;
case 6://客户编号
$condition .= "and b.user_id = " . trim($params['search_keyword']);
......@@ -1190,6 +1189,9 @@ class OrderLogService
case 7://商铺编号
$condition .= "and a.house_id = " . trim($params['search_keyword']);
break;
case 8://订单id
$condition .= "and a.id = " . trim($params['search_keyword']);
break;
default:
return ["code" => "101", "msg" => "搜索类型错误"];
}
......@@ -1225,7 +1227,7 @@ class OrderLogService
}
/**
* @param $params 1 .客户姓名 2.报备人电话 3.报备人姓名 4.商铺名称 5.商铺地址
* @param $params 1 .客户姓名 2.报备人电话 3.报备人姓名 4.商铺名称 5.商铺地址 8订单id
* @param $pageNo
* @param $pageSize
* @return array|mixed
......@@ -1255,8 +1257,7 @@ class OrderLogService
$condition .= "and a.house_title like '%" . trim($params['search_keyword']) . "%' ";
break;
case 5:
//todo 列表没有显示商铺地址 和产品沟通暂时搁置
//$condition["c.house_title"] = array( 'like', "%" . trim($params['search_keyword']) . "%" );
$condition .= "and c.internal_address like '%" . trim($params['search_keyword']) . "%' ";
break;
case 6://客户编号
$condition .= "and b.user_id = " . trim($params['search_keyword']);
......@@ -1264,6 +1265,9 @@ class OrderLogService
case 7://商铺编号
$condition .= "and a.house_id = " . trim($params['search_keyword']);
break;
case 8://订单id
$condition .= "and a.id = " . trim($params['search_keyword']);
break;
default:
return ["code" => "101", "msg" => "搜索类型错误"];
}
......
......@@ -127,6 +127,7 @@ class OrderModel extends Model
FROM
`o_order` `a`
LEFT JOIN `o_report` `b` ON `a`.`f_id` = `b`.`id`
LEFT JOIN `g_houses` `c` ON `a`.`house_id` = `c`.`id`
WHERE
$params
)
......@@ -137,6 +138,7 @@ class OrderModel extends Model
FROM
`o_order` `a`
LEFT JOIN `o_report` `b` ON `a`.`f_id` = `b`.`id`
LEFT JOIN `g_houses` `c` ON `a`.`house_id` = `c`.`id`
WHERE
$where_
)
......
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