Merge branch 'zhongqi-IntraCityExpress'

app-hd/controllers/MainController.php

@@ -2,6 +2,7 @@
 
 namespace hd\controllers;
 
+use biz\main\classes\MainClass;
 use biz\stat\classes\StatCgClass;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\wx\classes\WxOpenClass;
@@ -298,4 +299,11 @@ class MainController extends BaseController
         util::success(['base' => $base, 'more' => $more]);
     }
 
+    // 查询小程序的同城配送的微信门店编号
+    public function actionWxStoreId()
+    {
+        $main = MainClass::getById($this->mainId, true, 'id, wxStoreId');
+        util::success(['wx' => $main]);
+    }
+
 }

app-hd/controllers/ShopExtController.php

@@ -287,13 +287,6 @@ class ShopExtController extends BaseController
         util::complete('设置成功');
     }
 
-    public function actionInfo()
-    {
-        $shopId = $this->shopId;
-        $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
-        util::success(['ext' => $ext]);
-    }
-
     public function actionModifyGatherRepeat()
     {
         $staff = $this->shopAdmin;

biz/shop/classes/ShopClass.php

@@ -5,14 +5,8 @@ namespace biz\shop\classes;
 use biz\ghs\classes\GhsClass;
 use biz\pt\classes\PtAssetClass;
 use biz\pt\classes\PtYeChangeClass;
-use biz\sj\classes\SjClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
-use bizGhs\product\classes\ProductClass;
-use bizHd\ad\classes\AdClass;
-use bizHd\goods\classes\CategoryClass;
-use bizHd\goods\classes\GoodsSettingClass;
-use bizHd\saas\classes\ApplyClass;
 use common\components\dict;
 use common\components\httpUtil;
 use common\components\imgUtil;