Skip to content

N
newShopBack
Commit 6d0fc334 authored by 郭勇志's avatar 郭勇志
Browse files
Options

o2o配送列表

parent b3eef114
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
backend/controllers/v1/transport/O2oDeliveryController.php
View file @ 6d0fc334
...@@ -64,6 +64,10 @@ class O2oDeliveryController extends BaseController ...@@ -64,6 +64,10 @@ class O2oDeliveryController extends BaseController
$branchGuid=$userInfo['BRANCH_GUID']; $branchGuid=$userInfo['BRANCH_GUID'];
$parentBranchGuid=''; $parentBranchGuid='';
break; break;
default:
$branchGuid='';
$parentBranchGuid='';
break;
} }
$infoArr = $model->find() $infoArr = $model->find()
->alias('scds') ->alias('scds')
...@@ -282,6 +286,7 @@ class O2oDeliveryController extends BaseController ...@@ -282,6 +286,7 @@ class O2oDeliveryController extends BaseController
$result = ArrayHelper::index($settingInfo, 'BRANCH_GUID'); $result = ArrayHelper::index($settingInfo, 'BRANCH_GUID');
$transaction=$scdsImport->getDb()->beginTransaction(); $transaction=$scdsImport->getDb()->beginTransaction();
//置空不再验证此属性
$scdsImport->branchCodeArr = []; $scdsImport->branchCodeArr = [];
try { try {
foreach ($tempArr as $key => $valueB) { foreach ($tempArr as $key => $valueB) {
......
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