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
23730adc
Commit
23730adc
authored
Nov 26, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
share
parent
e7762b0f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
DeliveryService.php
application/models/Business/Store/DeliveryService.php
+5
-2
No files found.
application/models/Business/Store/DeliveryService.php
View file @
23730adc
...
...
@@ -34,8 +34,9 @@ class DeliveryServiceModel extends \Business\AbstractModel
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$storeDao
=
\DAO\StoreModel
::
getInstance
();
$qmDeliveryManLog
=
\DAO\Order\QmDeliverymanLogModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$deliveryManDao
=
\DAO\Order\DiliverymanModel
::
getInstance
();
$orderDao
->
setDb
(
$orderDao
->
dbName
);
$orderD
=
$orderDao
->
find
(
$data
[
'order
_i
d'
],
$orderDao
->
getOrderDetailField
());
$orderD
=
$orderDao
->
find
(
$data
[
'order
I
d'
],
$orderDao
->
getOrderDetailField
());
// if( $orderD['diliveryman_id']== $data['id']){
// ErrorModel::throwException(CodeConfigModel::alreadyExsitQmDeliveryLog);
// }
...
...
@@ -71,7 +72,9 @@ class DeliveryServiceModel extends \Business\AbstractModel
ErrorModel
::
throwException
(
CodeConfigModel
::
selectDeliveryFail
);
}
$orderDao
->
db
->
doCommit
();
$orderDao
->
deleteOrderCache
(
null
,
$data
[
'orderId'
],
$data
[
'storeId'
],
true
,
false
,
$orderD
[
'buyerId'
]);
$deliveryMan
=
$deliveryManDao
->
findById
(
$orderD
[
'diliverymanId'
]);
$deliveryManMemberId
=
$deliveryMan
[
'memberId'
];
$orderDao
->
deleteOrderCache
(
null
,
$data
[
'orderId'
],
$data
[
'storeId'
],
true
,
false
,
$deliveryManMemberId
);
$storeDao
->
deleteStoreCache
(
$data
[
'storeId'
],
$data
[
'orderId'
]);
return
$res
;
...
...
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