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
a17aa79a
Commit
a17aa79a
authored
Sep 08, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
6809ec27
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
OrderService.php
application/models/Business/Order/OrderService.php
+5
-5
OrderGoods.php
application/models/DAO/Order/OrderGoods.php
+1
-1
No files found.
application/models/Business/Order/OrderService.php
View file @
a17aa79a
...
...
@@ -835,15 +835,15 @@ class OrderServiceModel extends \Business\AbstractModel
$memberDao
=
\DAO\MemberModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$qmDeliverymanLogDao
=
\DAO\Order\QmDeliverymanLogModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$deliverymanId
=
$memberDao
->
getInfo
(
$memberid
,
'diliveryman_id'
);
$qmDeliveryManLog
=
$qmDeliverymanLogDao
->
findById
Cache
(
$id
);
$qmDeliveryManLog
=
$qmDeliverymanLogDao
->
findById
(
$id
);
if
(
$qmDeliveryManLog
[
'deliveryState'
]
==
ApiConst
::
deliveryStateWait
&&
$qmDeliveryManLog
[
'id'
]
==
$id
)
{
$updateResult
=
$qmDeliverymanLogDao
->
updateStatusById
(
$id
);
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
();
$order
=
$orderDao
->
findByOrderId
(
$qmDeliveryManLog
[
'orderId'
],
$orderDao
->
getOrderDetailField
());
if
(
$updateResult
)
{
$push
=
Push
::
getInstance
();
$push
->
reacheRemind
(
$order
[
'buyerId'
],
$order
[
'orderId'
],
$order
[
'orderSn'
]);
}
if
(
$updateResult
)
{
$push
=
Push
::
getInstance
();
$push
->
reacheRemind
(
$order
[
'buyerId'
],
$order
[
'orderId'
],
$order
[
'orderSn'
]);
}
$orderDao
->
deleteOrderCache
(
$memberid
,
$qmDeliveryManLog
[
'orderId'
],
$order
[
'storeId'
],
true
);
$qmDeliverymanLogDao
->
deleteOrderCache
(
$deliverymanId
,
$id
);
return
$updateResult
;
...
...
application/models/DAO/Order/OrderGoods.php
View file @
a17aa79a
...
...
@@ -119,7 +119,7 @@ class OrderGoodsModel extends \DAO\AbstractModel {
}
if
(
!
empty
(
$storeId
)){
// return \Our\RedisHelper::delCachedFunction(\Redis\Db5\OrderRedisModel::getInstance(), array(&$this, 'getOrderGoodsCountByStoreId'), array(),array($storeId));
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db6\
Order
RedisModel
::
getInstance
(),
array
(
&
$this
,
'getOrderGoodsCountByStoreId'
),
array
(),
array
(
$storeId
));
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db6\
Store
RedisModel
::
getInstance
(),
array
(
&
$this
,
'getOrderGoodsCountByStoreId'
),
array
(),
array
(
$storeId
));
}
return
true
;
}
...
...
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