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
5e9cd20e
Commit
5e9cd20e
authored
Nov 20, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
a75c501f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
DeliveryService.php
application/models/Business/Store/DeliveryService.php
+4
-4
No files found.
application/models/Business/Store/DeliveryService.php
View file @
5e9cd20e
...
...
@@ -47,15 +47,15 @@ class DeliveryServiceModel extends \Business\AbstractModel
$qmDeliveryManLogData
[
'distribution_fee'
]
=
$data
[
'distributionFee'
];
$qmDeliveryManLogData
[
'order_type'
]
=
$data
[
'orderType'
];
$qmDeliveryManLogData
[
'get_time'
]
=
TIMESTAMP
;
$qmDeliveryWhere
[
'diliveryman_id'
]
=
$qmDeliveryManLogData
[
'diliveryman_id'
];
//
$qmDeliveryWhere['diliveryman_id']= $qmDeliveryManLogData['diliveryman_id'];
$qmDeliveryWhere
[
'order_id'
]
=
$qmDeliveryManLogData
[
'order_id'
];
$qmDeliveryWhere
[
'order_type'
]
=
$qmDeliveryManLogData
[
'order_type'
];
$isRepeat
=
$qmDeliveryManLog
->
find
(
$qmDeliveryWhere
);
if
(
$isRepeat
){
$orderDao
->
db
->
doRollback
();
ErrorModel
::
throwException
(
CodeConfigModel
::
alreadyExsitQmDeliveryLog
);
$res
=
$qmDeliveryManLog
->
update
(
$qmDeliveryWhere
,
$qmDeliveryManLogData
);
}
else
{
$res
=
$qmDeliveryManLog
->
insert
(
$qmDeliveryManLogData
);
}
$res
=
$qmDeliveryManLog
->
insert
(
$qmDeliveryManLogData
);
if
(
!
res
)
{
$orderDao
->
db
->
doRollback
();
ErrorModel
::
throwException
(
CodeConfigModel
::
selectDeliveryFail
);
...
...
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