Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopback into development

backend/controllers/v1/common/DownTemplateController.php

@@ -17,7 +17,8 @@ class DownTemplateController extends BaseController
      *                 传入模板文件名和想返回的模板中文名，新添加的模板在这里添加，方便前端查看：
      *                 门店导入模板（import_branch.xls）；
      *                 员工信息导入模板（employee_import.xls）；
-     *                 门店服务评价打分模板（shop_branch_score_import.xls）；",
+     *                 门店服务评价打分模板（shop_branch_score_import.xls）；
+     *                 o2o配送价格导入模板（o2o_delivery_import.xls）",
      *   @OA\Parameter(name="ENG_NAME",in="query",required=true,description="模板名称",@OA\Schema(type="string")),
      *   @OA\Parameter(name="CN_NAME",in="query",required=true,description="模板中文名称",@OA\Schema(type="string")),
      *   @OA\Parameter(name="SUFFIX",in="query",description="excel后缀，默认xlsx，首字母大写",@OA\Schema(type="string")),

backend/controllers/v1/transport/O2oDeliveryController.php

@@ -12,6 +12,7 @@ use backend\helpers\UploadFiles;
 use yii\web\UploadedFile;
 use yidas\phpSpreadsheet\Helper;
 use app\models\v1\transport\ScdsImport;
+use yii\helpers\ArrayHelper;
 
 class O2oDeliveryController extends BaseController
 {
@@ -246,6 +247,7 @@ class O2oDeliveryController extends BaseController
     public function actionO2oDeliveryImport()
     {
         $scdsImport = new ScdsImport();
+        $scdrModel = new ShopCityDistributionRegion();
         $model = new UploadFiles();
         if (Yii::$app->request->isPost) {
             //多文件用getInstances
@@ -257,16 +259,30 @@ class O2oDeliveryController extends BaseController
                 $rows = Helper::newSpreadsheet($fileInfo['INFO'][0])->getRows();
                 $tempArr=array_slice($rows,2);
                 $codeArr=[];
-                $scdsImport->scenario = 'o2o_update';
+                $guidArr=[];
+                
+                $orgGuid = Yii::$app->user->identity->ORG_GUID;
                 foreach ($tempArr as $keyA => $valueA) {
                     $codeArr[] = $valueA[0];
+                    $guidArr[]=$orgGuid.'-'.$valueA[0];
                 }
+                $scdsImport->scenario = 'o2o_update';
                 $scdsImport->branchCodeArr = $codeArr;
-                if(!$scdsImport->validate()){
+                if(!$scdsImport->validate('branchCodeArr')){
                     return $scdsImport->errors;
                 }
+                //取得主副表信息
+                $settingInfo = $scdsImport->find()
+                        ->alias('scds')
+                        ->select('scdr.GUID,scds.BRANCH_GUID')
+                        ->leftjoin('shop_city_distribution_region scdr','scdr.CITY_DISTR_GUID=scds.GUID')
+                        ->where(['scds.BRANCH_GUID' => $guidArr])
+                        ->andFilterWhere(['scds.SETTING_TYPE'=>O2O_FLAG])//设定为o2o配送
+                        ->asArray()->all();
+                $result = ArrayHelper::index($settingInfo, 'BRANCH_GUID');
+             
                 $transaction=$scdsImport->getDb()->beginTransaction();
-                $orgGuid = Yii::$app->user->identity->ORG_GUID;
+                $scdsImport->branchCodeArr = [];
                 try {
                     foreach ($tempArr as $key => $valueB) {
                         $scdsImport->branchCode = $valueB[0];
@@ -284,12 +300,16 @@ class O2oDeliveryController extends BaseController
                             Yii::$app->response->statusCode = 422;
                             return $returnInfo;
                         }else{
+                            $branchGuid =  $orgGuid.'-'.$scdsImport->branchCode;
                             if ($scdsImport->REGION_TYPE==REGION_TYPE_REGION) {
                                 //区域更新shop_city_distribution_setting和shop_city_distribution_region俩表
-                                // $scdsImport->update();
-                                $scdsImport::updateAll(['status' => 1], ['status'=> $orgGuid.'-'.$scdsImport->branchCode,'SETTING_TYPE'=>O2O_FLAG]);  
+                               
+                                $scdsImport::updateAll(['REGION_TYPE' => $scdsImport->REGION_TYPE], ['BRANCH_GUID'=>$branchGuid,'SETTING_TYPE'=>O2O_FLAG]);  
+                                $scdrModel::updateAll(['DELIVERY_PRICE' => $scdsImport->DELIVERY_PRICE], ['GUID' => $result[$branchGuid]['GUID']]);
+                            
                             }elseif($scdsImport->REGION_TYPE==REGION_TYPE_DISTANCE){
                                 //距离更新shop_city_distribution_setting表
+                                $scdsImport::updateAll(['REGION_TYPE' => $scdsImport->REGION_TYPE,'REGION_DISTR_DISTANCE' => $scdsImport->REGION_DISTR_DISTANCE,'REGION_DISTR_PRICE' => $scdsImport->REGION_DISTR_PRICE,'INCREASE_DISTANCE' => $scdsImport->INCREASE_DISTANCE,'INCREASE_PRICE' => $scdsImport->INCREASE_PRICE], ['BRANCH_GUID'=>$branchGuid,'SETTING_TYPE'=>O2O_FLAG]);  
                             }
                             
                         }