修改目录名称

app/mall/controllers/PayController.php

@@ -7,7 +7,7 @@ use biz\goods\services\UsageRelationService;
 use biz\order\services\OrderService;
 use biz\promote\services\CouponService;
 use biz\user\services\UserAssetService;
-use biz\weixin\services\WxSceneService;
+use biz\wx\services\WxSceneService;
 use common\components\qrCodeUtil;
 use common\models\xhOrder;
 use common\models\xhShop;

app/saas/controllers/MiniUpgradeController.php

@@ -2,7 +2,7 @@
 
 namespace saas\controllers;
 
-use biz\weixin\services\MiniUpgradeService;
+use biz\wx\services\MiniUpgradeService;
 use common\components\util;
 use Yii;
 use yii\web\Controller;

app/saas/controllers/WxOpenController.php

@@ -4,16 +4,16 @@ namespace saas\controllers;
 
 use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
-use biz\weixin\services\MiniProgramService;
-use biz\weixin\services\WxBaseService;
-use biz\weixin\services\WxMiniBaseService;
+use biz\wx\services\MiniProgramService;
+use biz\wx\services\WxBaseService;
+use biz\wx\services\WxMiniBaseService;
 use common\components\util;
 use Yii;
 use common\components\wxUtil;
 use biz\ad\classes\AdClass;
 use biz\merchant\classes\MerchantExtendClass;
-use biz\weixin\classes\WxBaseClass;
-use biz\weixin\services\WxOpenService;
+use biz\wx\classes\WxBaseClass;
+use biz\wx\services\WxOpenService;
 use common\services\xhMerchantExtendService;
 use common\services\xhMerchantService;
 use common\services\xhInviteService;

app/shop/controllers/AdminShopController.php

@@ -2,6 +2,7 @@
 
 namespace shop\controllers;
 
+use biz\admin\services\AdminShopService;
 use common\components\jwt;
 use common\components\util;
 use Yii;
@@ -9,11 +10,18 @@ use yii\web\Controller;
 
 class AdminShopController extends BaseController
 {
+	
+	//添加管理员 shish 2020.4.16
+	public function actionAdd()
+	{
+		util::complete();
+	}
 
-    //添加管理员 shish 2020.4.16
-    public function actionAdd()
-    {
-        util::complete();
-    }
+	//创建管理员关联数据准备 shish 2020.4.17
+	public function actionPrepareBind()
+	{
+		$post = Yii::$app->request->post();
+		AdminShopService::prepareBindAdmin();
+	}
 
 }

app/shop/controllers/AuthController.php

@@ -6,7 +6,7 @@ use biz\admin\services\AdminShopService;
 use biz\admin\services\AdminService;
 use biz\auth\services\AuthService;
 use biz\user\classes\UserClass;
-use biz\weixin\services\WxOpenService;
+use biz\wx\services\WxOpenService;
 use common\components\httpUtil;
 use common\components\jwt;
 use common\components\util;

app/shop/controllers/WxMenuController.php

@@ -2,7 +2,7 @@
 
 namespace shop\controllers;
 
-use biz\weixin\services\WxMenuService;
+use biz\wx\services\WxMenuService;
 use common\components\configDict;
 use common\components\util;
 use common\components\wxUtil;

app/www/controllers/AuthController.php

@@ -3,7 +3,7 @@
 namespace www\controllers;
 
 use biz\auth\services\AuthService;
-use biz\weixin\services\WxOpenService;
+use biz\wx\services\WxOpenService;
 use common\components\util;
 use Yii;
 use biz\merchant\services\MerchantService;

app/www/controllers/BaseController.php

@@ -5,7 +5,7 @@ namespace www\controllers;
 use biz\merchant\services\MerchantService;
 use biz\saas\services\StaffService;
 use biz\user\services\UserService;
-use biz\weixin\services\WxOpenService;
+use biz\wx\services\WxOpenService;
 use common\components\jwt;
 use common\components\util;
 use Yii;

app/www/controllers/MiniUpgradeController.php

@@ -2,7 +2,7 @@
 
 namespace www\controllers;
 
-use biz\weixin\services\MiniUpgradeService;
+use biz\wx\services\MiniUpgradeService;
 use common\components\util;
 use Yii;
 use yii\web\Controller;

app/www/controllers/WxController.php

@@ -5,7 +5,7 @@ namespace www\controllers;
 use biz\promote\services\GuaGuaService;
 use biz\user\classes\UserClass;
 use biz\user\services\UserService;
-use biz\weixin\services\WxSceneService;
+use biz\wx\services\WxSceneService;
 use Yii;
 use common\services\xhCouponService;
 use common\services\xhMerchantExtendService;

app/www/controllers/WxOpenController.php

@@ -6,8 +6,8 @@ use biz\ad\classes\AdClass;
 use biz\goods\classes\CategoryClass;
 use biz\merchant\classes\MerchantExtendClass;
 use biz\merchant\services\MerchantService;
-use biz\weixin\classes\WxBaseClass;
-use biz\weixin\services\WxOpenService;
+use biz\wx\classes\WxBaseClass;
+use biz\wx\services\WxOpenService;
 use common\services\xhMerchantExtendService;
 use Yii;
 use common\services\xhApplyOrderService;

biz/admin/services/AdminShopService.php

@@ -15,7 +15,13 @@ use Yii;
 
 class AdminShopService extends BaseService
 {
-	
+
 	public static $baseFile = '\biz\admin\classes\AdminShopClass';
-	
+
+	///创建管理员关联数据准备 shish 2020.4.17
+	public static function prepareBindAdmin()
+	{
+
+	}
+
 }

biz/merchant/services/MerchantInitService.php

@@ -14,8 +14,8 @@ use biz\message\services\TMessageService;
 use biz\saas\services\SetAuthService;
 use biz\saas\services\SetMealService;
 use biz\user\services\UserService;
-use biz\weixin\classes\WxOpenClass;
-use biz\weixin\services\WxMenuService;
+use biz\wx\classes\WxOpenClass;
+use biz\wx\services\WxMenuService;
 use common\components\business;
 use common\components\util;
 use common\services\xhTMessageService;

biz/merchant/services/MerchantService.php

@@ -15,8 +15,8 @@ use biz\message\services\TMessageService;
 use biz\saas\services\SetAuthService;
 use biz\saas\services\SetMealService;
 use biz\user\services\UserService;
-use biz\weixin\classes\WxOpenClass;
-use biz\weixin\services\WxMenuService;
+use biz\wx\classes\WxOpenClass;
+use biz\wx\services\WxMenuService;
 use common\components\business;
 use common\components\util;
 use common\services\xhTMessageService;

biz/weixin/services/WxBaseService.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace biz\weixin\services;
-
-use biz\base\services\BaseService;
-use biz\weixin\classes\WxMenuClass;
-use biz\weixin\classes\WxOpenClass;
-use common\components\httpUtil;
-use common\components\tree;
-use Yii;
-
-class WxBaseService extends BaseService
-{
-
-	public static $baseFile = '\biz\weixin\classes\WxBaseClass';
-
-}

biz/weixin/services/WxMiniBaseService.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace biz\weixin\services;
-
-use biz\base\services\BaseService;
-use biz\weixin\classes\WxMenuClass;
-use biz\weixin\classes\WxOpenClass;
-use common\components\httpUtil;
-use common\components\tree;
-use Yii;
-
-class WxMiniBaseService extends BaseService
-{
-
-	public static $baseFile = '\biz\weixin\classes\WxMiniBaseClass';
-
-	
-	
-}

biz/weixin/classes/MiniProgramClass.php → biz/wx/classes/MiniProgramClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\classes;
+namespace biz\wx\classes;
 
 use common\components\wxUtil;
 use biz\base\classes\BaseClass;
@@ -8,7 +8,7 @@ use biz\base\classes\BaseClass;
 class MiniProgramClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\weixin\models\MiniProgram';
+	public static $baseFile = '\biz\wx\models\MiniProgram';
 	
 	//发布小程序 shish 2020.3.9
 	public static function release($merchant, $isOpen)

biz/weixin/classes/MiniUpgradeClass.php → biz/wx/classes/MiniUpgradeClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\classes;
+namespace biz\wx\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;
@@ -8,6 +8,6 @@ use biz\base\classes\BaseClass;
 class MiniUpgradeClass extends BaseClass
 {
 
-	public static $baseFile = '\biz\weixin\models\MiniUpgrade';
+	public static $baseFile = '\biz\wx\models\MiniUpgrade';
 
 }

biz/weixin/classes/WxBaseClass.php → biz/wx/classes/WxBaseClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\classes;
+namespace biz\wx\classes;
 
 use common\components\dirUtil;
 use common\components\stringUtil;
@@ -12,7 +12,7 @@ use linslin\yii2\curl;
 class WxBaseClass extends BaseClass
 {
 
-    public static $baseFile = '\biz\weixin\models\WxBase';
+    public static $baseFile = '\biz\wx\models\WxBase';
 
     //保存Logo shish 2020.3.11
     public static function saveLogo($url, $merchantId)

biz/weixin/classes/WxMenuClass.php → biz/wx/classes/WxMenuClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\classes;
+namespace biz\wx\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;
@@ -8,6 +8,6 @@ use biz\base\classes\BaseClass;
 class WxMenuClass extends BaseClass
 {
 
-	public static $baseFile = '\biz\weixin\models\WxMenu';
+	public static $baseFile = '\biz\wx\models\WxMenu';
 
 }

biz/weixin/classes/WxMiniBaseClass.php → biz/wx/classes/WxMiniBaseClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\classes;
+namespace biz\wx\classes;
 
 use common\components\dirUtil;
 use Yii;
@@ -11,6 +11,6 @@ use linslin\yii2\curl;
 class WxMiniBaseClass extends BaseClass
 {
 
-	public static $baseFile = '\biz\weixin\models\WxMiniBase';
+	public static $baseFile = '\biz\wx\models\WxMiniBase';
 
 }

biz/weixin/classes/WxOpenClass.php → biz/wx/classes/WxOpenClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\classes;
+namespace biz\wx\classes;
 
 use biz\merchant\classes\MerchantClass;
 use common\components\util;
@@ -10,7 +10,7 @@ use biz\base\classes\BaseClass;
 class WxOpenClass extends BaseClass
 {
 
-    public static $baseFile = '\biz\weixin\models\WxOpen';
+    public static $baseFile = '\biz\wx\models\WxOpen';
 
     //平台管理员的手机号
     const ADMIN_MOBILE = 15280215347;

biz/weixin/classes/WxSceneClass.php → biz/wx/classes/WxSceneClass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\classes;
+namespace biz\wx\classes;
 
 use Yii;
 use biz\base\classes\BaseClass;
@@ -8,5 +8,5 @@ use biz\base\classes\BaseClass;
 class WxSceneClass extends BaseClass
 {
 	
-	public static $baseFile = '\biz\weixin\models\WxScene';
+	public static $baseFile = '\biz\wx\models\WxScene';
 }

biz/weixin/models/MiniProgram.php → biz/wx/models/MiniProgram.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\weixin\models;
+namespace biz\wx\models;
 use biz\base\models\Base;
 
 class MiniProgram extends Base

biz/weixin/models/MiniUpgrade.php → biz/wx/models/MiniUpgrade.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\weixin\models;
+namespace biz\wx\models;
 use biz\base\models\Base;
 
 class MiniUpgrade extends Base

biz/weixin/models/WxBase.php → biz/wx/models/WxBase.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\weixin\models;
+namespace biz\wx\models;
 use biz\base\models\Base;
 
 class WxBase extends Base

biz/weixin/models/WxMenu.php → biz/wx/models/WxMenu.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\weixin\models;
+namespace biz\wx\models;
 use biz\base\models\Base;
 
 class WxMenu extends Base

biz/weixin/models/WxMiniBase.php → biz/wx/models/WxMiniBase.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\weixin\models;
+namespace biz\wx\models;
 use biz\base\models\Base;
 
 class WxMiniBase extends Base

biz/weixin/models/WxOpen.php → biz/wx/models/WxOpen.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\weixin\models;
+namespace biz\wx\models;
 use biz\base\models\Base;
 
 class WxOpen extends Base

biz/weixin/models/WxScene.php → biz/wx/models/WxScene.php

@@ -1,5 +1,5 @@
 <?php
-namespace biz\weixin\models;
+namespace biz\wx\models;
 use biz\base\models\Base;
 class WxScene extends Base
 {

biz/weixin/services/MiniProgramService.php → biz/wx/services/MiniProgramService.php

@@ -1,17 +1,17 @@
 <?php
 
-namespace biz\weixin\services;
+namespace biz\wx\services;
 
 use biz\base\services\BaseService;
 use biz\merchant\services\MerchantService;
-use biz\weixin\classes\MiniProgramClass;
-use biz\weixin\classes\MiniUpgradeClass;
+use biz\wx\classes\MiniProgramClass;
+use biz\wx\classes\MiniUpgradeClass;
 use Yii;
 
 class MiniProgramService extends BaseService
 {
 	
-	public static $baseFile = '\biz\weixin\classes\MiniProgramClass';
+	public static $baseFile = '\biz\wx\classes\MiniProgramClass';
 	
 	//发布已经审核通过的小程序 shish 2020.3.9
 	public static function release($merchant, $isOpen = 0)

biz/weixin/services/MiniUpgradeService.php → biz/wx/services/MiniUpgradeService.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace biz\weixin\services;
+namespace biz\wx\services;
 
 use biz\base\services\BaseService;
 use biz\merchant\services\MerchantService;
-use biz\weixin\classes\MiniUpgradeClass;
+use biz\wx\classes\MiniUpgradeClass;
 use Yii;
 
 class MiniUpgradeService extends BaseService
 {
 	
-	public static $baseFile = '\biz\weixin\classes\MiniUpgradeClass';
+	public static $baseFile = '\biz\wx\classes\MiniUpgradeClass';
 	
 	//获取升级申请的记录 shish 2019.12.20
 	public static function getUpgradeList($where)

biz/wx/services/WxBaseService.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace biz\wx\services;
+
+use biz\base\services\BaseService;
+use biz\wx\classes\WxMenuClass;
+use biz\wx\classes\WxOpenClass;
+use common\components\httpUtil;
+use common\components\tree;
+use Yii;
+
+class WxBaseService extends BaseService
+{
+
+	public static $baseFile = '\biz\wx\classes\WxBaseClass';
+
+}

biz/weixin/services/WxMenuService.php → biz/wx/services/WxMenuService.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace biz\weixin\services;
+namespace biz\wx\services;
 
 use biz\base\services\BaseService;
-use biz\weixin\classes\WxMenuClass;
-use biz\weixin\classes\WxOpenClass;
+use biz\wx\classes\WxMenuClass;
+use biz\wx\classes\WxOpenClass;
 use common\components\httpUtil;
 use common\components\tree;
 use Yii;
@@ -12,7 +12,7 @@ use Yii;
 class WxMenuService extends BaseService
 {
 
-	public static $baseFile = '\biz\weixin\classes\WxMenuClass';
+	public static $baseFile = '\biz\wx\classes\WxMenuClass';
 
 	public static function getMenuTree($merchantId)
 	{

biz/wx/services/WxMiniBaseService.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace biz\wx\services;
+
+use biz\base\services\BaseService;
+use biz\wx\classes\WxMenuClass;
+use biz\wx\classes\WxOpenClass;
+use common\components\httpUtil;
+use common\components\tree;
+use Yii;
+
+class WxMiniBaseService extends BaseService
+{
+
+	public static $baseFile = '\biz\wx\classes\WxMiniBaseClass';
+
+	
+	
+}

biz/weixin/services/WxOpenService.php → biz/wx/services/WxOpenService.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace biz\weixin\services;
+namespace biz\wx\services;
 
 use biz\base\services\BaseService;
-use biz\weixin\classes\WxOpenClass;
+use biz\wx\classes\WxOpenClass;
 use Yii;
 
 class WxOpenService extends BaseService
 {
 
-    public static $baseFile = '\biz\weixin\classes\WxOpenClass';
+    public static $baseFile = '\biz\wx\classes\WxOpenClass';
 
     //获取平台基础信息 shish 2020.2.11
     public static function getOpen()

biz/weixin/services/WxSceneService.php → biz/wx/services/WxSceneService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace biz\weixin\services;
+namespace biz\wx\services;
 
 use biz\base\services\BaseService;
 use biz\merchant\services\MerchantService;
@@ -15,7 +15,7 @@ use common\components\wxUtil;
 class WxSceneService extends BaseService
 {
 	
-	public static $baseFile = '\biz\weixin\classes\WxSceneClass';
+	public static $baseFile = '\biz\wx\classes\WxSceneClass';
 	
 	//生成刮刮卡的场景id shish 2019.9.5
 	public static function generateGuaGuaScene($id, $merchantId)

common/components/jwt.php

@@ -7,7 +7,7 @@
 
 namespace common\components;
 
-use biz\weixin\services\WxOpenService;
+use biz\wx\services\WxOpenService;
 use Lcobucci\JWT\Builder;
 use Lcobucci\JWT\Parser;
 use Lcobucci\JWT\ValidationData;

common/components/rabbitmq/consumer/openShopInitConsumer.php

@@ -10,7 +10,7 @@ namespace common\components\rabbitmq\consumer;
 
 
 use biz\merchant\services\MerchantService;
-use biz\weixin\services\WxOpenService;
+use biz\wx\services\WxOpenService;
 use common\components\sms;
 use mikemadisonweb\rabbitmq\components\ConsumerInterface;
 use PhpAmqpLib\Message\AMQPMessage;

common/components/sms.php

@@ -3,7 +3,7 @@
 namespace common\components;
 
 use biz\merchant\services\MerchantAssetService;
-use biz\weixin\services\WxOpenService;
+use biz\wx\services\WxOpenService;
 use Yii;
 
 /**

common/components/wxUtil.php

@@ -2,10 +2,10 @@
 
 namespace common\components;
 
-use biz\weixin\classes\WxOpenClass;
-use biz\weixin\services\WxBaseService;
-use biz\weixin\services\WxMiniBaseService;
-use biz\weixin\services\WxOpenService;
+use biz\wx\classes\WxOpenClass;
+use biz\wx\services\WxBaseService;
+use biz\wx\services\WxMiniBaseService;
+use biz\wx\services\WxOpenService;
 use common\services\xhMerchantExtendService;
 use Yii;
 use yii\helpers\Json;

common/services/xhWxMenuService.php

@@ -3,7 +3,7 @@
 namespace common\services;
 
 use biz\message\services\TMessageService;
-use biz\weixin\services\WxOpenService;
+use biz\wx\services\WxOpenService;
 use Yii;
 use common\components\wxUtil;
 use common\components\configDict;

console/controllers/UpgradeController.php

@@ -21,8 +21,8 @@ use biz\user\services\UserAssetService;
 use biz\user\services\UserCapitalService;
 use biz\user\services\UserGrowthService;
 use biz\user\services\UserService;
-use biz\weixin\classes\WxBaseClass;
-use biz\weixin\services\WxMenuService;
+use biz\wx\classes\WxBaseClass;
+use biz\wx\services\WxMenuService;
 use common\components\dirUtil;
 use common\components\util;
 use common\components\wxUtil;