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
e56edec1
Commit
e56edec1
authored
Aug 27, 2018
by
hujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
商铺下架推送消息
parent
1c234755
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
68 additions
and
16 deletions
+68
-16
Shop.php
application/api_broker/controller/Shop.php
+6
-0
PushMessageService.php
application/api_broker/service/PushMessageService.php
+25
-3
Houses.php
application/index/controller/Houses.php
+8
-3
ABindingDevice.php
application/model/ABindingDevice.php
+11
-8
GHouses.php
application/model/GHouses.php
+4
-2
UpdateShopStatusTask.php
application/task/controller/UpdateShopStatusTask.php
+14
-0
No files found.
application/api_broker/controller/Shop.php
View file @
e56edec1
...
@@ -4,6 +4,7 @@ namespace app\api_broker\controller;
...
@@ -4,6 +4,7 @@ namespace app\api_broker\controller;
use
app\api_broker\extend\Basic
;
use
app\api_broker\extend\Basic
;
use
app\api_broker\service\LookShopService
;
use
app\api_broker\service\LookShopService
;
use
app\api_broker\service\PushMessageService
;
use
app\api_broker\service\VerifyService
;
use
app\api_broker\service\VerifyService
;
use
app\api_broker\service\VipService
;
use
app\api_broker\service\VipService
;
use
app\index\validate\HouseValidate
;
use
app\index\validate\HouseValidate
;
...
@@ -465,6 +466,11 @@ class Shop extends Basic
...
@@ -465,6 +466,11 @@ class Shop extends Basic
$result
[
'data'
][
'house_id'
]
=
$house_id
[
'house_id'
];
$result
[
'data'
][
'house_id'
]
=
$house_id
[
'house_id'
];
$result
[
'data'
][
'internal_title'
]
=
empty
(
$this
->
params
[
'internal_title'
])
?
""
:
$this
->
params
[
'internal_title'
];
$result
[
'data'
][
'internal_title'
]
=
empty
(
$this
->
params
[
'internal_title'
])
?
""
:
$this
->
params
[
'internal_title'
];
$result
[
'msg'
]
=
'新增或编辑成功'
;
$result
[
'msg'
]
=
'新增或编辑成功'
;
if
(
isset
(
$house_id
[
'status'
])
&&
$house_id
[
'status'
]
==
2
)
{
$push_service
=
new
PushMessageService
();
$push_service
->
pushHouseDownMessage
(
$house_id
[
'house_id'
]);
}
}
else
{
}
else
{
$data
[
'code'
]
=
101
;
$data
[
'code'
]
=
101
;
$data
[
'msg'
]
=
'Add houses failure'
;
$data
[
'msg'
]
=
'Add houses failure'
;
...
...
application/api_broker/service/PushMessageService.php
View file @
e56edec1
...
@@ -244,6 +244,31 @@ class PushMessageService
...
@@ -244,6 +244,31 @@ class PushMessageService
return
;
return
;
}
}
/**
* 根据商铺id 推送下架消息
*
* @param $house_id
* @return bool|void
*/
public
function
pushHouseDownMessage
(
$house_id
)
{
$house
=
new
GHouses
();
try
{
$house_data
=
$house
->
getHouseInfoById
(
'internal_title'
,[
'id'
=>
$house_id
]);
$content
=
'你的【'
.
$house_data
[
'internal_title'
]
.
'】商铺下架,如需要上架,请编辑提交该商铺'
;
$house_agent
=
new
GHousesToAgents
();
$house_agent_data
=
$house_agent
->
getAgentList
(
$house_id
,
2
,
'a.agents_id'
);
}
catch
(
\Exception
$e
)
{
return
false
;
}
foreach
(
$house_agent_data
as
$k
=>
$v
)
{
$this
->
pushAgentAllDeviceId
(
$v
[
'agents_id'
],
'商铺下架'
,
$content
,
'house_info'
,
$house_id
);
}
return
;
}
/**
/**
* @param $id
* @param $id
* @param $title
* @param $title
...
@@ -251,9 +276,6 @@ class PushMessageService
...
@@ -251,9 +276,6 @@ class PushMessageService
* @param null $type
* @param null $type
* @param null $user_id
* @param null $user_id
* @return bool
* @return bool
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
*/
public
function
pushAgentAllDeviceId
(
$id
,
$title
,
$content
,
$type
=
null
,
$user_id
=
null
)
public
function
pushAgentAllDeviceId
(
$id
,
$title
,
$content
,
$type
=
null
,
$user_id
=
null
)
{
{
...
...
application/index/controller/Houses.php
View file @
e56edec1
...
@@ -65,14 +65,19 @@ class Houses extends Basic
...
@@ -65,14 +65,19 @@ class Houses extends Basic
if
(
!
empty
(
$this
->
params
[
'sublet_id'
])
&&
$this
->
params
[
'source'
]
==
'transfer_list'
)
{
if
(
!
empty
(
$this
->
params
[
'sublet_id'
])
&&
$this
->
params
[
'source'
]
==
'transfer_list'
)
{
$m_sublet
=
new
SubletModel
();
$m_sublet
=
new
SubletModel
();
$sublet_data
[
'house_id'
]
=
$house_id
;
$sublet_data
[
'house_id'
]
=
$house_id
[
'house_id'
]
;
$sublet_data
[
'status'
]
=
2
;
$sublet_data
[
'status'
]
=
2
;
$sublet_data
[
'agents_id'
]
=
$this
->
userId
;
$sublet_data
[
'agents_id'
]
=
$this
->
userId
;
$m_sublet
->
editData
(
$sublet_data
,
$this
->
params
[
'sublet_id'
]);
$m_sublet
->
editData
(
$sublet_data
,
$this
->
params
[
'sublet_id'
]);
}
}
if
(
$house_id
)
{
if
(
$house_id
[
'house_id'
])
{
$return
=
$this
->
response
(
$result
[
'code'
],
$result
[
'msg'
],
[
'id'
,
$house_id
]);
$return
=
$this
->
response
(
$result
[
'code'
],
$result
[
'msg'
],
[
'id'
,
$house_id
[
'house_id'
]
]);
if
(
isset
(
$house_id
[
'status'
])
&&
$house_id
[
'status'
]
==
2
)
{
$push_service
=
new
PushMessageService
();
$push_service
->
pushHouseDownMessage
(
$house_id
[
'house_id'
]);
}
}
else
{
}
else
{
$return
=
$this
->
response
(
101
,
'add houses is error'
);
$return
=
$this
->
response
(
101
,
'add houses is error'
);
}
}
...
...
application/model/ABindingDevice.php
View file @
e56edec1
...
@@ -64,9 +64,6 @@ class ABindingDevice extends BaseModel
...
@@ -64,9 +64,6 @@ class ABindingDevice extends BaseModel
* @param array $params
* @param array $params
* @param string $field
* @param string $field
* @return false|\PDOStatement|string|\think\Collection
* @return false|\PDOStatement|string|\think\Collection
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
*/
public
function
getDeviceByAgentId
(
array
$params
,
string
$field
=
"id,agent_id,device_id,is_forbidden,model,push_id,is_pc"
)
public
function
getDeviceByAgentId
(
array
$params
,
string
$field
=
"id,agent_id,device_id,is_forbidden,model,push_id,is_pc"
)
{
{
...
@@ -83,11 +80,17 @@ class ABindingDevice extends BaseModel
...
@@ -83,11 +80,17 @@ class ABindingDevice extends BaseModel
if
(
isset
(
$params
[
"is_pc"
]))
{
if
(
isset
(
$params
[
"is_pc"
]))
{
$where_
[
"is_pc"
]
=
$params
[
"is_pc"
];
$where_
[
"is_pc"
]
=
$params
[
"is_pc"
];
}
}
$data
=
$this
->
field
(
$field
)
try
{
->
where
(
$where_
)
$data
=
$this
->
order
(
"create_time desc"
)
->
field
(
$field
)
->
select
();
->
where
(
$where_
)
->
order
(
"create_time desc"
)
->
select
();
}
catch
(
\Exception
$e
)
{
$data
=
[];
}
return
$data
;
return
$data
;
}
}
...
...
application/model/GHouses.php
View file @
e56edec1
...
@@ -474,6 +474,7 @@ class GHouses extends BaseModel
...
@@ -474,6 +474,7 @@ class GHouses extends BaseModel
$params
[
'operation_id'
]
=
$params
[
'userId'
];
$params
[
'operation_id'
]
=
$params
[
'userId'
];
$this
->
allowField
(
true
)
->
isUpdate
(
true
)
->
save
(
$params
,
[
'id'
=>
$params
[
'id'
]
]);
$this
->
allowField
(
true
)
->
isUpdate
(
true
)
->
save
(
$params
,
[
'id'
=>
$params
[
'id'
]
]);
$house_id
=
$this
->
id
;
$house_id
=
$this
->
id
;
$result
[
'status'
]
=
$params
[
'status'
];
}
}
$params
[
'house_id'
]
=
$house_id
;
$params
[
'house_id'
]
=
$house_id
;
...
@@ -543,8 +544,8 @@ class GHouses extends BaseModel
...
@@ -543,8 +544,8 @@ class GHouses extends BaseModel
}
else
{
}
else
{
$this
->
rollback
();
$this
->
rollback
();
}
}
$result
[
'house_id'
]
=
$house_id
;
return
$
house_id
;
return
$
result
;
}
}
/**
/**
...
@@ -1054,6 +1055,7 @@ class GHouses extends BaseModel
...
@@ -1054,6 +1055,7 @@ class GHouses extends BaseModel
}
}
$result
[
'internal_title'
]
=
$house_data
[
'internal_title'
];
$result
[
'internal_title'
]
=
$house_data
[
'internal_title'
];
$result
[
'house_id'
]
=
$house_id
;
$result
[
'house_id'
]
=
$house_id
;
$result
[
'status'
]
=
$params
[
'status'
];
}
}
$params
[
'house_id'
]
=
$house_id
;
$params
[
'house_id'
]
=
$house_id
;
...
...
application/task/controller/UpdateShopStatusTask.php
View file @
e56edec1
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
namespace
app\task\controller
;
namespace
app\task\controller
;
use
app\api_broker\service\PushMessageService
;
use
app\model\GHouses
;
use
app\model\GHouses
;
use
app\model\GHousesFollowUp
;
use
app\model\GHousesFollowUp
;
use
app\model\OrderModel
;
use
app\model\OrderModel
;
...
@@ -19,6 +20,7 @@ class UpdateShopStatusTask
...
@@ -19,6 +20,7 @@ class UpdateShopStatusTask
{
{
private
$shopModel
;
private
$shopModel
;
public
$house_id
=
[];
function
__construct
()
function
__construct
()
{
{
$this
->
shopModel
=
new
GHouses
();
$this
->
shopModel
=
new
GHouses
();
...
@@ -74,6 +76,7 @@ class UpdateShopStatusTask
...
@@ -74,6 +76,7 @@ class UpdateShopStatusTask
if
(
!
$is_ok
&&
!
$is_follow
)
{
if
(
!
$is_ok
&&
!
$is_follow
)
{
$update_arr
[
$key
][
"id"
]
=
$item
[
"id"
];
$update_arr
[
$key
][
"id"
]
=
$item
[
"id"
];
$update_arr
[
$key
][
"status"
]
=
2
;
$update_arr
[
$key
][
"status"
]
=
2
;
$this
->
house_id
[]
=
$item
[
'id'
];
}
}
}
}
if
(
count
(
$update_arr
)
>
0
)
{
if
(
count
(
$update_arr
)
>
0
)
{
...
@@ -99,6 +102,7 @@ class UpdateShopStatusTask
...
@@ -99,6 +102,7 @@ class UpdateShopStatusTask
foreach
(
$result
as
$k
=>
$item
)
{
foreach
(
$result
as
$k
=>
$item
)
{
$update_arr
[
$k
][
"id"
]
=
$item
[
"id"
];
$update_arr
[
$k
][
"id"
]
=
$item
[
"id"
];
$update_arr
[
$k
][
"status"
]
=
2
;
$update_arr
[
$k
][
"status"
]
=
2
;
$this
->
house_id
[]
=
$item
[
'id'
];
}
}
$this
->
shopModel
->
updateHouse
(
$update_arr
);
$this
->
shopModel
->
updateHouse
(
$update_arr
);
}
}
...
@@ -121,10 +125,19 @@ class UpdateShopStatusTask
...
@@ -121,10 +125,19 @@ class UpdateShopStatusTask
foreach
(
$result
as
$key
=>
$item
)
{
foreach
(
$result
as
$key
=>
$item
)
{
$update_arr
[
$key
][
"id"
]
=
$item
[
"id"
];
$update_arr
[
$key
][
"id"
]
=
$item
[
"id"
];
$update_arr
[
$key
][
"status"
]
=
2
;
$update_arr
[
$key
][
"status"
]
=
2
;
$this
->
house_id
[]
=
$item
[
'id'
];
}
}
if
(
count
(
$update_arr
)
>
0
)
{
if
(
count
(
$update_arr
)
>
0
)
{
$this
->
shopModel
->
updateHouse
(
$update_arr
);
$this
->
shopModel
->
updateHouse
(
$update_arr
);
}
}
}
}
public
function
__destruct
()
{
//处理下架推送消息
$push_service
=
new
PushMessageService
();
foreach
(
$this
->
house_id
as
$k
=>
$v
)
{
$push_service
->
pushHouseDownMessage
(
$v
);
}
}
}
}
\ No newline at end of file
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