门店优化

app-ghs/controllers/ShopController.php

@@ -59,10 +59,17 @@ class ShopController extends BaseController
         $data['shopId'] = $this->shopId;
         $data['adminId'] = $this->adminId;
         $data['img'] = is_array($data['img']) ? json_encode($data['img']) : $data['img'];
+
+        if (isset($data['shopName']) == false || empty($data['shopName'])) {
+            util::fail('请填写门店名称');
+        }
+        $sj = $this->sj;
+        $sjName = $sj['name'] ?? '';
+        $data['merchantName'] = $sjName;
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
-            $shop = \biz\shop\classes\ShopClass::addShop($data);
+            \biz\shop\classes\ShopClass::addShop($data);
             $transaction->commit();
             util::complete();
         } catch (\Exception $exception) {

app-hd/controllers/ShopController.php

@@ -52,8 +52,23 @@ class ShopController extends BaseController
         $data['merchantId'] = $this->sjId;
         $data['shopId'] = $this->shopId;
         $data['adminId'] = $this->adminId;
-        ShopClass::addShop($data);
-        util::complete();
+        $data['img'] = is_array($data['img']) ? json_encode($data['img']) : $data['img'];
+        if (isset($data['shopName']) == false || empty($data['shopName'])) {
+            util::fail('请填写门店名称');
+        }
+        $sj = $this->sj;
+        $sjName = $sj['name'] ?? '';
+        $data['merchantName'] = $sjName;
+        $connection = Yii::$app->db;
+        $transaction = $connection->beginTransaction();
+        try {
+            ShopClass::addShop($data);
+            $transaction->commit();
+            util::complete();
+        } catch (\Exception $exception) {
+            $transaction->rollBack();
+            util::fail();
+        }
     }
 
     //切换门店 linqh 2021.1.31

biz-ghs/merchant/classes/MerchantClass.php

@@ -57,156 +57,6 @@ class MerchantClass extends BaseClass
         return $list;
     }
 
-    //创建商家信息 ssh 2020.2.11
-    public static function generateMerchant($data)
-    {
-        //生成商家
-        $date = date("Y-m-d H:i:s");
-        $time = time();
-        $data['accountStyle'] = 0;//认证服务号
-        $data['status'] = 0;//待审核
-        $data['createTime'] = $date;
-        $data['updateTime'] = $date;
-        $data['lat'] = isset($data['lat']) ? $data['lat'] : (string)0;
-        $data['long'] = isset($data['long']) ? $data['long'] : (string)0;
-        $data['precision'] = (string)0;
-        $data['wxToken'] = stringUtil::buildWxToken(0);
-        $data['photoList'] = isset($data['photoList']) ? $data['photoList'] : '';
-        $data['name'] = isset($data['name']) ? $data['name'] : '';
-        $data['province'] = isset($data['province']) ? $data['province'] : '';
-        $data['city'] = isset($data['city']) ? $data['city'] : '';
-        $data['shopDist'] = isset($data['dist']) ? $data['dist'] : '';
-        $data['address'] = isset($data['address']) ? $data['address'] : '';
-        $data['alipayAccount'] = isset($data['alipayAccount']) ? $data['alipayAccount'] : '';
-        $data['alipayAccountName'] = isset($data['alipayAccountName']) ? $data['alipayAccountName'] : '';
-        //默认设置为代理商
-        $data['agentLevel'] = 1;
-        //申请表的id去掉，商家有自己的id
-        unset($data['id']);
-        $merchant = self::add($data);
-        $adminId = $data['adminId'];
-        $merchantId = $merchant['id'];
-        $mobile = $data['mobile'];
-        //生成商家资产
-        $assetData = [
-            'balance' => 0,
-            'totalVisit' => 0,
-            'totalUser' => 0,
-            'totalMember' => 0,
-            'totalFans' => 0,
-            'totalIntegral' => 0,
-            'totalPoint' => 0,
-            'totalGoods' => 0,
-            'totalRecharge' => 0,
-            'totalOrder' => 0,
-            'totalDeal' => 0,
-            'merchantId' => $merchantId,
-            'totalIncome' => 0,
-            'totalExpend' => 0,
-            'createTime' => $date,
-            'updateTime' => $date,
-        ];
-        //商家资产表
-        MerchantAssetClass::add($assetData);
-
-        //生成商家拓展信息
-        $extendData = [
-            'merchantId' => $merchantId,
-            'wxAppId' => isset($data['wxAppId']) ? $data['wxAppId'] : '',
-            'webTitle' => isset($data['name']) ? $data['name'] : '',
-            'webKeyword' => isset($data['name']) ? $data['name'] : '',
-            'webDescription' => isset($data['name']) ? $data['name'] : '',
-            'wxMenuInit' => 0,
-            'wxTMessageInit' => 0,
-            'payment' => 0,//支付功能关闭
-            'recharge' => 0,//充值功能关闭
-            'giveCoupon' => 1,//默认赠送代金劵
-            'giveCouponPrice' => 5,//代金劵金额5元
-            'couponMeetPrice' => 180,//满足金额
-            'couponValidity' => 30,//代金劵有效期30天
-            'alipayAccount' => isset($data['alipayAccount']) ? $data['alipayAccount'] : '',//提现的支付宝帐号
-            'alipayAccountName' => isset($data['alipayAccountName']) ? $data['alipayAccountName'] : '',//提现支付宝帐号姓名
-            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折；2 级会员需要满 5000 积分 购物享88折
-            'createTime' => $date,
-            'updateTime' => $date,
-        ];
-        MerchantExtendClass::add($extendData);
-
-        MerchantInitClass::add(['merchantId' => $merchantId]);
-
-        //商家商品配置信息
-        $setData = [
-            'merchantId' => $merchantId,
-            'riseType' => 0,
-            'riseAmount' => 0,
-            'addTime' => time(),
-        ];
-        GoodsSettingClass::add($setData);
-
-        //创建门店
-        $shopData = [
-            'shopName' => $merchant['name'],
-            'merchantId' => $merchantId,
-            'addTime' => $time,
-            'createTime' => $date,
-            'updateTime' => $date,
-            'openTime' => '8:00 - 23:00',
-            'telephone' => $mobile,
-            'introduction' => '欢迎光临',
-            'province' => isset($data['province']) ? $data['province'] : '',
-            'city' => isset($data['city']) ? $data['city'] : '',
-            'dist' => isset($data['dist']) ? $data['dist'] : '',
-            'default' => 1,
-            'address' => isset($data['address']) ? $data['address'] : '',
-            'fullAddress' => isset($data['fullAddress']) ? $data['fullAddress'] : '',
-        ];
-        $shopReturn = ShopClass::addShop($shopData);
-        $shopId = $shopReturn['id'];
-        //设置商家默认门店
-        MerchantClass::updateById($merchantId, ['defaultShopId' => $shopId]);
-
-        //创建管理员角色
-        $hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId]);
-        if (empty($hasRole)) {
-            AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
-            $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '店长', 'merchantId' => $merchantId, 'auth' => '*']);
-            $roleId = $roleReturn['id'];
-        }
-
-        //创建管理员
-        $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
-        if (empty($shopAdmin)) {
-            $adminData = [
-                'password' => password_hash($mobile, PASSWORD_BCRYPT),
-                'payPassword' => password_hash($mobile, PASSWORD_BCRYPT),
-                'mobile' => $mobile
-            ];
-            AdminClass::updateById($adminId, $adminData);
-            $shopData = [
-                'adminId' => $adminId,
-                'shopId' => $shopId,
-                'merchantId' => $merchantId,
-                'remind' => 1,
-                'roleId' => $roleId,
-                'default' => 1,
-                'addTime' => $time,
-            ];
-            print_r($shopData);
-            ShopAdminClass::add($shopData);
-        }
-
-        //商品和分类初始化
-        CategoryClass::initCategoryGoods($merchantId);
-
-        //商城和门店广告初始化
-        AdClass::initAdd($merchantId);
-
-        //优惠券资产与配置信息初始化
-        CouponAssetClass::add(['merchantId' => $merchantId, 'switch' => 1]);
-
-        return $merchant;
-    }
-
     //h5商城链接二维码 ssh 2020.4.30
     public static function getH5MallQrCode($id)
     {

biz-hd/merchant/services/ShopService.php

@@ -59,13 +59,7 @@ class ShopService extends BaseService
 	{
 		return ShopClass::getDefaultShopId($merchant);
 	}
-	
-	//添加门店 ssh 2020.2.29
-	public static function addShop($data)
-	{
-		return ShopClass::addShop($data);
-	}
-	
+
 	//更新门店 ssh 2020.2.29
 	public static function updateShop($id, $data)
 	{

biz-mall/merchant/classes/MerchantClass.php

@@ -57,155 +57,6 @@ class MerchantClass extends BaseClass
         return $list;
     }
 
-    //创建商家信息 ssh 2020.2.11
-    public static function generateMerchant($data)
-    {
-        //生成商家
-        $date = date("Y-m-d H:i:s");
-        $time = time();
-        $data['accountStyle'] = 0;//认证服务号
-        $data['status'] = 0;//待审核
-        $data['createTime'] = $date;
-        $data['updateTime'] = $date;
-        $data['lat'] = isset($data['lat']) ? $data['lat'] : (string)0;
-        $data['long'] = isset($data['long']) ? $data['long'] : (string)0;
-        $data['precision'] = (string)0;
-        $data['wxToken'] = stringUtil::buildWxToken(0);
-        $data['photoList'] = isset($data['photoList']) ? $data['photoList'] : '';
-        $data['name'] = isset($data['name']) ? $data['name'] : '';
-        $data['province'] = isset($data['province']) ? $data['province'] : '';
-        $data['city'] = isset($data['city']) ? $data['city'] : '';
-        $data['shopDist'] = isset($data['dist']) ? $data['dist'] : '';
-        $data['address'] = isset($data['address']) ? $data['address'] : '';
-        $data['alipayAccount'] = isset($data['alipayAccount']) ? $data['alipayAccount'] : '';
-        $data['alipayAccountName'] = isset($data['alipayAccountName']) ? $data['alipayAccountName'] : '';
-        //默认设置为代理商
-        $data['agentLevel'] = 1;
-        //申请表的id去掉，商家有自己的id
-        unset($data['id']);
-        $merchant = self::add($data);
-        $adminId = $data['adminId'];
-        $merchantId = $merchant['id'];
-        $mobile = $data['mobile'];
-        //生成商家资产
-        $assetData = [
-            'balance' => 0,
-            'totalVisit' => 0,
-            'totalUser' => 0,
-            'totalMember' => 0,
-            'totalFans' => 0,
-            'totalIntegral' => 0,
-            'totalPoint' => 0,
-            'totalGoods' => 0,
-            'totalRecharge' => 0,
-            'totalOrder' => 0,
-            'totalDeal' => 0,
-            'merchantId' => $merchantId,
-            'totalIncome' => 0,
-            'totalExpend' => 0,
-            'createTime' => $date,
-            'updateTime' => $date,
-        ];
-        //商家资产表
-        MerchantAssetClass::add($assetData);
-
-        //生成商家拓展信息
-        $extendData = [
-            'merchantId' => $merchantId,
-            'wxAppId' => isset($data['wxAppId']) ? $data['wxAppId'] : '',
-            'webTitle' => isset($data['name']) ? $data['name'] : '',
-            'webKeyword' => isset($data['name']) ? $data['name'] : '',
-            'webDescription' => isset($data['name']) ? $data['name'] : '',
-            'wxMenuInit' => 0,
-            'wxTMessageInit' => 0,
-            'payment' => 0,//支付功能关闭
-            'recharge' => 0,//充值功能关闭
-            'giveCoupon' => 1,//默认赠送代金劵
-            'giveCouponPrice' => 5,//代金劵金额5元
-            'couponMeetPrice' => 180,//满足金额
-            'couponValidity' => 30,//代金劵有效期30天
-            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折；2 级会员需要满 5000 积分 购物享88折
-            'createTime' => $date,
-            'updateTime' => $date,
-        ];
-        MerchantExtendClass::add($extendData);
-
-        MerchantInitClass::add(['merchantId' => $merchantId]);
-
-        //商家商品配置信息
-        $setData = [
-            'merchantId' => $merchantId,
-            'riseType' => 0,
-            'riseAmount' => 0,
-            'addTime' => time(),
-        ];
-        GoodsSettingClass::add($setData);
-
-        //创建门店
-        $shopData = [
-            'shopName' => $merchant['name'],
-            'merchantId' => $merchantId,
-            'addTime' => $time,
-            'createTime' => $date,
-            'updateTime' => $date,
-            'openTime' => '8:00 - 23:00',
-            'telephone' => $mobile,
-            'introduction' => '欢迎光临',
-            'province' => isset($data['province']) ? $data['province'] : '',
-            'city' => isset($data['city']) ? $data['city'] : '',
-            'dist' => isset($data['dist']) ? $data['dist'] : '',
-            'default' => 1,
-            'address' => isset($data['address']) ? $data['address'] : '',
-            'fullAddress' => isset($data['fullAddress']) ? $data['fullAddress'] : '',
-        ];
-        $shopReturn = ShopClass::addShop($shopData);
-        $shopId = $shopReturn['id'];
-        //设置商家默认门店
-        MerchantClass::updateById($merchantId, ['defaultShopId' => $shopId]);
-
-        //创建管理员角色
-        $roleId = 0;
-        $hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId]);
-        if (empty($hasRole)) {
-            AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
-            $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '店长', 'merchantId' => $merchantId, 'auth' => '*']);
-            $roleId = $roleReturn['id'];
-        }
-
-        //创建管理员
-        $shopAdmin = ShopAdminClass::getByCondition(['shopId' => $shopId, 'adminId' => $adminId]);
-        if (empty($shopAdmin)) {
-            $adminData = [
-                'password' => password_hash($mobile, PASSWORD_BCRYPT),
-                'payPassword' => password_hash($mobile, PASSWORD_BCRYPT),
-                'mobile' => $mobile
-            ];
-            AdminClass::updateById($adminId, $adminData);
-            $shopData = [
-                'adminId' => $adminId,
-                'shopId' => $shopId,
-                'merchantId' => $merchantId,
-                'remind' => 1,
-                'roleId' => $roleId,
-                'default' => 1,
-                'addTime' => $time,
-            ];
-            print_r($shopData);
-            ShopAdminClass::add($shopData);
-        }
-
-        //商品和分类初始化
-        CategoryClass::initCategoryGoods($merchantId);
-
-        //商城和门店广告初始化
-        AdClass::initAdd($merchantId);
-
-        //优惠券资产与配置信息初始化
-        CouponAssetClass::add(['merchantId' => $merchantId, 'switch' => 1]);
-
-        return $merchant;
-    }
-
     //h5商城链接二维码 ssh 2020.4.30
     public static function getH5MallQrCode($id)
     {

biz-mall/merchant/services/ShopService.php

@@ -59,13 +59,7 @@ class ShopService extends BaseService
 	{
 		return ShopClass::getDefaultShopId($merchant);
 	}
-	
-	//添加门店 ssh 2020.2.29
-	public static function addShop($data)
-	{
-		return ShopClass::addShop($data);
-	}
-	
+
 	//更新门店 ssh 2020.2.29
 	public static function updateShop($id, $data)
 	{

biz-mall/saas/services/ApplyService.php

@@ -49,20 +49,6 @@ class ApplyService extends BaseService
 		return $data;
 	}
 
-	//审核通过
-	public static function pass($id)
-	{
-		$apply = ApplyClass::getById($id);
-		if (empty($apply)) {
-			util::fail('没有找到申请记录');
-		}
-		$apply['name'] = isset($apply['name']) ? $apply['name'] : '';
-		$adminId = $apply['adminId'];
-		$admin = AdminClass::getById($adminId);
-		$apply['adminName'] = isset($admin['name']) ? $admin['name'] : '';
-		return MerchantClass::generateMerchant($apply);
-	}
-	
 	//新增推荐 ssh 2020.2.27
 	public static function addApply($data)
 	{

biz/shop/services/ShopService.php

@@ -60,12 +60,6 @@ class ShopService extends BaseService
 		return ShopClass::getDefaultShopId($merchant);
 	}
 
-	//添加门店 ssh 2020.2.29
-	public static function addShop($data)
-	{
-		return ShopClass::addShop($data);
-	}
-
 	//更新门店 ssh 2020.2.29
 	public static function updateShop($id, $data)
 	{

biz/sj/services/MerchantService.php

@@ -164,7 +164,7 @@ class MerchantService extends BaseService
             'lat' => $applyData['lat'] ?? '',
             'long' => $applyData['long'] ?? '',
         ];
-        $shopRespond = ShopClass::addShop($shopData);
+        $shopRespond = \biz\shop\classes\ShopClass::addShop($shopData);
         $shopId = $shopRespond['id'];
 
         //员工、角色、商品、分类等等初始化