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
a9c78a18
Commit
a9c78a18
authored
Dec 25, 2018
by
chenchuanwen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
myself
parent
434102e1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
OrderService.php
application/models/Business/Order/OrderService.php
+13
-3
DeliveryService.php
application/models/Business/Store/DeliveryService.php
+1
-0
No files found.
application/models/Business/Order/OrderService.php
View file @
a9c78a18
...
...
@@ -849,8 +849,9 @@ class OrderServiceModel extends \Business\AbstractModel
public
function
canformRecieveOrder
()
{
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$memberDao
=
\DAO\MemberModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$qmDeliverymanLogsDao
=
\DAO\Order\QmDeliverymanLogModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$orders
=
$orderDao
->
getOrdersByOrderState
(
ApiConst
::
orderStateWaitRecieve
,
'accept_time'
,
ApiConst
::
orderWaitRecieveTwentyFourHours
,
$this
->
orderMessageField
,
array
(
ApiConst
::
bySeller
,
ApiConst
::
express
));
$orders
=
$orderDao
->
getOrdersByOrderState
(
ApiConst
::
orderStateWaitRecieve
,
'accept_time'
,
ApiConst
::
orderWaitRecieveTwentyFourHours
,
$this
->
orderMessageField
,
array
(
ApiConst
::
bySeller
,
ApiConst
::
bySelf
));
if
(
!
empty
(
$orders
))
{
$sellerTypeOrderIds
=
$orderDao
->
getShippingTypeSellerOrdersByOrders
(
$orders
);
$qmDeliverymanLogs
=
$qmDeliverymanLogsDao
->
getFinishDeliveryByOrderId
(
$sellerTypeOrderIds
);
...
...
@@ -864,15 +865,24 @@ class OrderServiceModel extends \Business\AbstractModel
if
(
$order
[
'shippingType'
]
==
ApiConst
::
bySeller
)
{
if
(
isset
(
$qmDeliverymanLogsOrderIds
[
$order
[
'orderId'
]]))
{
array_push
(
$sellerOrderIds
,
$order
[
'orderId'
]);
$orderDao
->
deleteOrderCache
(
$order
[
'buyerId'
],
$order
[
'orderId'
],
$order
[
'storeId'
],
true
);
$orderDao
->
deleteOrderCache
(
$order
[
'buyerId'
],
$order
[
'orderId'
],
$order
[
'storeId'
],
true
);
}
}
else
{
}
if
(
$order
[
'shippingType'
]
==
ApiConst
::
bySelf
){
$limitTime
=
TIMESTAMP
-
ApiConst
::
orderWaitRecieveThreeDays
;
if
(
$order
[
'acceptTime'
]
<
$limitTime
)
{
array_push
(
$expressOrderIds
,
$order
[
'orderId'
]);
$orderDao
->
deleteOrderCache
(
$order
[
'buyerId'
],
$order
[
'orderId'
],
$order
[
'storeId'
],
true
);
}
}
// } else {
// $limitTime = TIMESTAMP - ApiConst::orderWaitRecieveThreeDays;
// if ($order['acceptTime'] < $limitTime) {
// array_push($expressOrderIds, $order['orderId']);
// $orderDao->deleteOrderCache($order['buyerId'], $order['orderId'], $order['storeId'],true);
// }
// }
$memberDao
->
deleteTotalCache
(
$order
[
'buyerId'
]);
\Our\RedisHelper
::
memberTotalFromStateToState
(
$order
[
'buyerId'
],
$order
[
'orderState'
],
ApiConst
::
orderStateComplete
);
}
$updateOrderIds
=
array_merge
(
$sellerOrderIds
,
$expressOrderIds
);
...
...
application/models/Business/Store/DeliveryService.php
View file @
a9c78a18
...
...
@@ -104,6 +104,7 @@ class DeliveryServiceModel extends \Business\AbstractModel
$orderDao
->
deleteOrderCache
(
null
,
$data
[
'orderId'
],
$data
[
'storeId'
],
true
,
false
,
$deliveryManMemberIds
);
$storeDao
->
deleteStoreCache
(
$data
[
'storeId'
],
$data
[
'orderId'
]);
$storeDao
->
deleteStoreRefundCache
(
$data
[
'storeId'
],
$data
[
'orderId'
]);
$orderDao
->
deleteOrderCache
(
$orderD
[
'buyerId'
],
$orderD
[
'orderId'
]);
//配送员推送
$push
=
\Our\Push
::
getInstance
();
if
(
$data
[
'orderType'
]
==
ApiConst
::
orderTypeRefund
){
...
...
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