Skip to content

M
my-yaf-project
Commit 5e9cd20e authored by christ's avatar christ
Browse files
Options

pc

parent a75c501f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
application/models/Business/Store/DeliveryService.php
View file @ 5e9cd20e
...@@ -47,15 +47,15 @@ class DeliveryServiceModel extends \Business\AbstractModel ...@@ -47,15 +47,15 @@ class DeliveryServiceModel extends \Business\AbstractModel
$qmDeliveryManLogData['distribution_fee'] = $data['distributionFee']; $qmDeliveryManLogData['distribution_fee'] = $data['distributionFee'];
$qmDeliveryManLogData['order_type'] = $data['orderType']; $qmDeliveryManLogData['order_type'] = $data['orderType'];
$qmDeliveryManLogData['get_time'] = TIMESTAMP; $qmDeliveryManLogData['get_time'] = TIMESTAMP;
$qmDeliveryWhere['diliveryman_id']= $qmDeliveryManLogData['diliveryman_id']; // $qmDeliveryWhere['diliveryman_id']= $qmDeliveryManLogData['diliveryman_id'];
$qmDeliveryWhere['order_id']=$qmDeliveryManLogData['order_id']; $qmDeliveryWhere['order_id']=$qmDeliveryManLogData['order_id'];
$qmDeliveryWhere['order_type']=$qmDeliveryManLogData['order_type']; $qmDeliveryWhere['order_type']=$qmDeliveryManLogData['order_type'];
$isRepeat=$qmDeliveryManLog->find($qmDeliveryWhere); $isRepeat=$qmDeliveryManLog->find($qmDeliveryWhere);
if($isRepeat){ if($isRepeat){
$orderDao->db->doRollback(); $res=$qmDeliveryManLog->update($qmDeliveryWhere,$qmDeliveryManLogData);
ErrorModel::throwException(CodeConfigModel::alreadyExsitQmDeliveryLog); }else{
$res = $qmDeliveryManLog->insert($qmDeliveryManLogData);
} }
$res = $qmDeliveryManLog->insert($qmDeliveryManLogData);
if (!res) { if (!res) {
$orderDao->db->doRollback(); $orderDao->db->doRollback();
ErrorModel::throwException(CodeConfigModel::selectDeliveryFail); ErrorModel::throwException(CodeConfigModel::selectDeliveryFail);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment