Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/CustomController.php

@@ -172,6 +172,7 @@ class CustomController extends BaseController
         $cachedKey = 'copy_firstShop_customers';
         Yii::$app->redis->executeCommand('LPUSH', [$cachedKey, $shopId . '_' . $defaultShopId]);
         Yii::info("复制首店的客户：分店id =  " . $shopId . ' 首店id = ' . $defaultShopId);
+        util::complete();
     }
 
     //客户列表 ssh 2021.7.8

console/controllers/CustomController.php

@@ -282,11 +282,12 @@ class CustomController extends Controller
             $shopId = $shopIdArr[0];
             $defaultShopId = $shopIdArr[1];
 
-            $customers = CustomClass::getByCondition(['ownShopId' => $defaultShopId], true);
+            Yii::$app->params['ptStyle'] = 2; // 后继代码，要用到此参数
+            $customers = CustomClass::getAllByCondition(['ownShopId' => $defaultShopId], null, ['shopId']);
             foreach($customers as $customer) {
-                $exist = CustomClass::exists(['ownShopId'=> $shopId, 'shopId'=>$customer->shopId]);
+                $exist = CustomClass::exists(['ownShopId'=> $shopId, 'shopId'=>$customer['shopId']]);
                 if (!$exist) {
-                    CustomClass::build($shopId, $customer->shopId);
+                    CustomClass::build($shopId, $customer['shopId']);
                 }
             }
         }