Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
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
chenchuanwen
my-yaf-project
Commits
f1b6451d
Commit
f1b6451d
authored
Oct 23, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
8dc3a899
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
7 deletions
+54
-7
ApiConst.php
application/library/Our/ApiConst.php
+4
-3
DescribeConst.php
application/library/Our/DescribeConst.php
+2
-0
MemberIdConst.php
application/library/Our/MemberIdConst.php
+13
-0
Push.php
application/library/Our/Push.php
+22
-1
OrderService.php
application/models/Business/Order/OrderService.php
+3
-1
QmDeliverymanLog.php
application/models/DAO/Order/QmDeliverymanLog.php
+9
-1
pushWaitComfirm.php
scripts/crontab/order/pushWaitComfirm.php
+1
-1
No files found.
application/library/Our/ApiConst.php
View file @
f1b6451d
...
...
@@ -85,8 +85,9 @@ class ApiConst
const
storeMessageType
=
4
;
//普通用户消息类型
const
memberMessageType
=
5
;
//配送员用户消息类型
//快递消息
const
deliveryUserMessageType
=
8
;
const
ordinaryMessage
=
0
;
const
onePictureMessage
=
21
;
const
reacheCallMessage
=
1
;
...
...
@@ -397,7 +398,7 @@ class ApiConst
//消息模板类型
const
reachRemindMessageType
=
1
;
const
waitRecieveOrderType
=
15
;
const
deliveryOrderType
=
16
;
//消息按钮类型
const
messageButtonTypeConfirmButton
=
1
;
//确认收货
const
messageButtonTypeReciverButton
=
2
;
//确认接单
...
...
application/library/Our/DescribeConst.php
View file @
f1b6451d
...
...
@@ -154,6 +154,8 @@ class DescribeConst
const
reacheRemindTitle
=
'你的订单卖家已经送达'
;
const
reacheRemindContent
=
'你有新的订单号为{0}的订单已经已经送达'
;
const
deliveryRemindTitle
=
'你有新的配送订单'
;
//店铺有新订单
const
recieveWaitTitle
=
'您有新的订单'
;
const
recieveWaitContent
=
'您有新的订单号为{0}的订单,是否需要接单'
;
...
...
application/library/Our/MemberIdConst.php
0 → 100644
View file @
f1b6451d
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2018/10/23
* Time: 19:01
*/
namespace
Our
;
class
MemberIdConst
{
const
deliveryId
=
395
;
//店铺首页顶部广告位
const
deliveryMessageName
=
'配送消息'
;
//店铺首页中部广告位
}
\ No newline at end of file
application/library/Our/Push.php
View file @
f1b6451d
...
...
@@ -164,6 +164,27 @@ class Push
$id
=
time
()
.
(
string
)
$this
->
orderIdStr
.
$orderId
;
$this
->
pushMessage
(
$id
,
$this
->
orderId
,
$toId
,
$this
->
orderId
,
$toUserId
,
$this
->
orderName
,
$member
[
'memberName'
],
ApiConst
::
orderMessageType
,
ApiConst
::
memberMessageType
,
$fromAvatar
,
$message
);
}
//配送提醒
public
function
deliveryRemind
(
$toId
,
$orderId
)
{
$memberDao
=
\DAO\MemberModel
::
getInstance
();
$member
=
$memberDao
->
getInfo
(
$toId
);
$toId
=
$toId
;
$toUserId
=
$toId
;
$orderService
=
\Business\Order\OrderServiceModel
::
getInstance
();
$orderDetail
=
$orderService
->
getOrderDetail
(
$orderId
);
$messageContent
=
$this
->
getOrderMessageContent
(
$orderDetail
);
$href
=
Common
::
format
(
PathConst
::
orderId
,
$orderId
);
$fromAvatar
=
Common
::
getStaticFile
(
ImageConst
::
orderAvatarName
,
ImageConst
::
systemAvatar
);
// $buttons=$this->getRecieveButtons($orderId);
$message
=
$this
->
getMessageTemplate
(
ApiConst
::
deliveryOrderType
,
DescribeConst
::
deliveryRemindTitle
,
$messageContent
,
''
,
''
,
$href
,
ApiConst
::
zero
);
$id
=
time
()
.
(
string
)
$this
->
orderIdStr
.
$orderId
;
$this
->
pushMessage
(
$id
,
\Our\MemberIdConst
::
deliveryId
,
$toId
,
\Our\MemberIdConst
::
deliveryId
,
$toUserId
,
\Our\MemberIdConst
::
deliveryMessageName
,
$member
[
'memberName'
],
ApiConst
::
orderMessageType
,
ApiConst
::
deliveryUserMessageType
,
$fromAvatar
,
$message
);
}
public
function
sendDelivery
(
$toId
,
$orderId
){
$this
->
deliveryRemind
(
$toId
,
$orderId
);
$this
->
sendTcpMessage
();
}
private
function
getButton
(
$buttonType
,
$name
,
$buttonId
,
$params
){
return
array
(
'type'
=>
$buttonType
,
...
...
@@ -197,7 +218,7 @@ class Push
$messageContent
.=
$orderGood
[
'goodsName'
]
.
'×'
.
$orderGood
[
'goodsNum'
]
.
"
\n
"
;
}
$messageContent
.=
'支付方式:'
.
ArrayConst
::
paymentTypes
[
$orderDetail
[
'paymentType'
]]
.
"
\n
"
;
$messageContent
.=
'付款状态:'
.
(
ArrayConst
::
paymentTypes
[
$orderDetail
[
'paymentTime'
]
]
>
ApiConst
::
zero
?
DescribeConst
::
payed
:
DescribeConst
::
notPayed
)
.
"
\n
"
;
$messageContent
.=
'付款状态:'
.
(
$orderDetail
[
'paymentTime'
]
>
ApiConst
::
zero
?
DescribeConst
::
payed
:
DescribeConst
::
notPayed
)
.
"
\n
"
;
$messageContent
.=
'收货地址:'
.
$orderDetail
[
'reciverInfo'
][
'address'
]
.
"
\n
"
;
$messageContent
.=
'收货人:'
.
$orderDetail
[
'reciverInfo'
][
'trueName'
]
.
"
\n
"
;
$messageContent
.=
'收货人电话:'
.
$orderDetail
[
'reciverInfo'
][
'mobPhone'
]
.
"
\n
"
;
...
...
application/models/Business/Order/OrderService.php
View file @
f1b6451d
...
...
@@ -442,7 +442,7 @@ class OrderServiceModel extends \Business\AbstractModel
file_put_contents
(
$savePath
,
TIMESTAMP
);
}
//推送确认收货消息到用户
//推送确认收货消息到用户
和配送
public
function
pushConfirmOrder
()
{
$baseConfDir
=
\Our\Common
::
getConfig
(
'out.config'
);
...
...
@@ -450,6 +450,7 @@ class OrderServiceModel extends \Business\AbstractModel
$addTime
=
file_get_contents
(
$savePath
);
$addTime
=
$addTime
?
$addTime
:
ApiConst
::
zero
;
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$qmDeliverymanLogDao
=
\DAO\Order\QmDeliverymanLogModel
::
getInstance
(
DbNameConst
::
salveDBConnectName
);
$pageBegin
=
PageConst
::
taskPageBegin
;
$push
=
Push
::
getInstance
();
do
{
...
...
@@ -462,6 +463,7 @@ class OrderServiceModel extends \Business\AbstractModel
$push
->
reacheRemind
(
$order
[
'buyerId'
],
$order
[
'orderId'
],
$order
[
'orderSn'
]);
}
}
$pageBegin
++
;
}
while
(
!
empty
(
$orders
[
'list'
]));
$push
->
sendTcpMessage
();
...
...
application/models/DAO/Order/QmDeliverymanLog.php
View file @
f1b6451d
...
...
@@ -84,7 +84,15 @@ class QmDeliverymanLogModel extends \DAO\AbstractModel
* @param $pageSize
* @return array
*/
//任务脚本方法
public
function
getSendOrders
(
$orderState
,
$addTime
,
$pageIndex
,
$pageSize
,
$timeField
=
'add_time'
)
{
$this
->
setDb
(
$this
->
dbName
);
$where
[
'order_state'
]
=
ApiConst
::
orderStateWaitConfirm
;
$where
=
Common
::
format
(
' get_time BETWEEN{1}>={2} and {1}<{3}'
,
$orderState
,
$timeField
,
$addTime
,
TIMESTAMP
);
$list
=
$this
->
lists
(
$where
,
array
(
'add_time'
=>
'asc'
),
$this
->
getOrderDetailField
(),
$pageIndex
,
$pageSize
);
return
$list
;
}
public
function
getListByDeliverymanIdAndType
(
$diliveryId
,
$type
,
$pageIndex
,
$pageSize
,
$order
=
array
(
'get_time'
=>
'desc'
))
{
$this
->
setDb
(
$this
->
dbName
);
...
...
scripts/crontab/order/pushWaitComfirm.php
100755 → 100644
View file @
f1b6451d
<?php
/**
* 推送确认收货消息到用户
* 推送确认收货消息到用户
和配送订单给配送员
* 执行时间:每分钟执行一次
*
* @author chenjiebin <sjlinyu@qq.com>
...
...
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