商城文件增加前缀

app/shop/controllers/MallAuthController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\merchant\services\MerchantService;
 use biz\user\classes\UserClass;
@@ -19,7 +19,7 @@ use yii\helpers\Json;
  * 微信 oauth 授权相关
  *
  */
-class AuthController extends PublicController
+class MallAuthController extends PublicController
 {
 	
 	//准备授权 shish 2019.11.19

app/shop/controllers/MallBaseController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\stat\services\StatVisitService;
 use Yii;
@@ -17,7 +17,7 @@ use common\components\util;
  * Date: 2019/11/18 0018
  * Time: 14:58
  */
-class BaseController extends PublicController
+class MallBaseController extends PublicController
 {
 	
 	public $validate = true;

app/shop/controllers/MallCategoryController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\goods\services\CategoryService;
 use biz\goods\services\GoodsCategoryService;
@@ -8,7 +8,7 @@ use Yii;
 use yii\web\Controller;
 use common\components\util;
 
-class CategoryController extends BaseController
+class MallCategoryController extends BaseController
 {
 	
 	//获取分类 shish 2019.12.2

app/shop/controllers/MallChatController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\goods\services\GoodsService;
 use biz\merchant\services\MerchantService;
@@ -10,7 +10,7 @@ use common\components\util;
 use Yii;
 use GatewayClient\Gateway;
 
-class ChatController extends BaseController
+class MallChatController extends BaseController
 {
 	
 	//聊天首页，前端使用

app/shop/controllers/MallCouponController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\promote\services\CouponService;
 use Yii;
 use common\components\util;
 
-class CouponController extends BaseController
+class MallCouponController extends BaseController
 {
 
 	//优惠券列表 shish 2019.12.11

app/shop/controllers/MallExpressController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\merchant\services\ExpressService;
 use biz\merchant\services\ShopService;
@@ -8,7 +8,7 @@ use Yii;
 use yii\web\Controller;
 use common\components\util;
 
-class ExpressController extends BaseController
+class MallExpressController extends BaseController
 {
 
 	//计算客户距离和运费 shish 2020.5.14

app/shop/controllers/MallGoodsController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\goods\services\CategoryService;
 use biz\goods\services\GoodsCategoryService;
@@ -10,7 +10,7 @@ use Yii;
 use yii\web\Controller;
 use common\components\util;
 
-class GoodsController extends BaseController
+class MallGoodsController extends BaseController
 {
 	
 	//获取商品详情 shish 2019.12.3

app/shop/controllers/MallInformUserController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\message\services\SmsService;
 use biz\user\services\UserAssetService;
@@ -11,7 +11,7 @@ use Yii;
 use common\components\util;
 use yii\helpers\Json;
 
-class InformUserController extends BaseController
+class MallInformUserController extends BaseController
 {
 	
 	//发送短信

app/shop/controllers/MallInviteController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\invite\services\InviteAssetService;
 use biz\invite\services\InviteService;
@@ -8,7 +8,7 @@ use biz\invite\services\InviteStatService;
 use common\components\util;
 use Yii;
 
-class InviteController extends BaseController
+class MallInviteController extends BaseController
 {
 	
 	//邀请有礼列表 shish 2019.12.18

app/shop/controllers/MallMainController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\ad\services\AdService;
 use biz\goods\services\CategoryService;
@@ -9,7 +9,7 @@ use Yii;
 use yii\web\Controller;
 use common\components\util;
 
-class MainController extends BaseController
+class MallMainController extends BaseController
 {
 	
 	//首页 shish 2019.12.2

app/shop/controllers/MallMapController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use common\components\mapUtil;
 use common\components\util;
 use Yii;
 
-class MapController extends BaseController
+class MallMapController extends BaseController
 {
 	
 	public $withoutLogin = ['suggestion'];

app/shop/controllers/MallMerchantController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
@@ -9,7 +9,7 @@ use Yii;
 use yii\web\Controller;
 use common\components\util;
 
-class MerchantController extends BaseController
+class MallMerchantController extends BaseController
 {
 	
 	//当前用户获取门店信息

app/shop/controllers/MallNoticeController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\merchant\services\MerchantExtendService;
 use Yii;
@@ -13,7 +13,7 @@ use common\services\xhMerchantService;
 use common\services\xhPayToolService;
 
 
-class NoticeController extends PublicController
+class MallNoticeController extends PublicController
 {
 	
 	public $categoryList;

app/shop/controllers/MallOrderController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\goods\services\CategoryService;
 use biz\goods\services\GoodsCategoryService;
@@ -24,7 +24,7 @@ use Yii;
 use yii\web\Controller;
 use common\components\util;
 
-class OrderController extends BaseController
+class MallOrderController extends BaseController
 {
 
     public $withoutLogin = ['order-relate', 'fast-pay'];

app/shop/controllers/MallPayController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\goods\services\CategoryRelateService;
 use biz\goods\services\UsageRelationService;
@@ -26,7 +26,7 @@ use common\components\util;
 use common\components\stringUtil;
 use common\components\configDict;
 
-class PayController extends BaseController
+class MallPayController extends BaseController
 {
 
 	public $withoutLogin = ['get-params'];

app/shop/controllers/MallPaymentController.php

@@ -1,12 +1,12 @@
 <?php
-namespace mall\controllers;
+namespace shop\controllers;
 
 use common\components\util;
 
 use common\components\configDict;
 use common\services\xhOrderService;
 
-class PaymentController extends MobileendController
+class MallPaymentController extends MobileendController
 {
 	/**
 	 * 快速下单

app/shop/controllers/MallPublicController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\merchant\services\MerchantService;
 use common\components\baseController;
@@ -9,7 +9,7 @@ use common\components\httpUtil;
 /**
  * 前台公共类
  */
-class PublicController extends baseController
+class MallPublicController extends baseController
 {
 	
 	public $webTitle = '花卉宝';

app/shop/controllers/MallRechargeController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\user\services\UserService;
 use common\components\httpUtil;
@@ -10,7 +10,7 @@ use common\services\xhRechargeService;
 use Yii;
 use yii\web\Controller;
 
-class RechargeController extends BaseController
+class MallRechargeController extends BaseController
 {
 	
 	//发起充值 shish 2019.12.19

app/shop/controllers/MallShopController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\ad\services\AdService;
 use biz\goods\services\CategoryService;
@@ -13,7 +13,7 @@ use Yii;
 use yii\web\Controller;
 use common\components\util;
 
-class ShopController extends BaseController
+class MallShopController extends BaseController
 {
 	
 	//获取商家的默认门店 shish 2019.12.6

app/shop/controllers/MallTestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\merchant\services\MerchantService;
 use biz\message\services\InformAdminService;
@@ -9,7 +9,7 @@ use common\components\noticeUtil;
 use common\components\util;
 use Yii;
 
-class TestController extends PublicController
+class MallTestController extends PublicController
 {
 
 	public $withoutLogin = ['index'];

app/shop/controllers/MallUploadController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use Yii;
 use common\components\util;
 
-class UploadController extends BaseController
+class MallUploadController extends BaseController
 {
 	
 	public $withoutLogin = [];

app/shop/controllers/MallUserController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use biz\merchant\services\MerchantExtendService;
 use biz\message\services\SmsService;
@@ -12,7 +12,7 @@ use Yii;
 use common\components\util;
 use yii\helpers\Json;
 
-class UserController extends BaseController
+class MallUserController extends BaseController
 {
 	
 	//获取登陆客户的资产 shish 2019.11.22

app/shop/controllers/MallWxShareController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace mall\controllers;
+namespace shop\controllers;
 
 use common\components\jsSDK;
 use common\components\util;
 use Yii;
 
-class WxShareController extends BaseController
+class MallWxShareController extends BaseController
 {
 	
 	//取微信分享的参数 shish 2020.2.22