Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
965073dd
Commit
965073dd
authored
Jan 09, 2019
by
zw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
name
parent
076bc6c6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
OrderLogService.php
application/api_broker/service/OrderLogService.php
+10
-6
OrderModel.php
application/model/OrderModel.php
+2
-0
No files found.
application/api_broker/service/OrderLogService.php
View file @
965073dd
...
...
@@ -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"
=>
"搜索类型错误"
];
}
...
...
application/model/OrderModel.php
View file @
965073dd
...
...
@@ -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_
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment