审核通过流程

app/ghs/controllers/CustomController.php

@@ -22,7 +22,7 @@ class CustomController extends BaseController
 		$get = Yii::$app->request->get();
 		$type = isset($get['type']) ? $get['type'] : 0;
 		$name = isset($get['name']) ? $get['name'] : '';
-		$where = ['merchantId' => $this->sjId];
+		$where = ['sjId' => $this->sjId];
 		switch ($type) {
 			case 1:
 				//已开店

biz-ghs/custom/classes/CustomClass.php

@@ -40,11 +40,11 @@ class CustomClass extends BaseClass
 			return $list;
 		}
 		//获取客户信息
-		$downIdList = array_unique(array_filter(array_column($list, 'downId')));
-		$retailInfo = MerchantClass::getByIds($downIdList, null, 'id');
+		$customSjIdList = array_unique(array_filter(array_column($list, 'customSjId')));
+		$retailInfo = MerchantClass::getByIds($customSjIdList, null, 'id');
 		foreach ($list as $key => $val) {
-			$downId = $val['downId'];
-			$currentInfo = isset($retailInfo[$downId]) ? $retailInfo[$downId] : [];
+			$customSjId = $val['customSjId'];
+			$currentInfo = isset($retailInfo[$customSjId]) ? $retailInfo[$customSjId] : [];
 			//组合头像
 			$currentInfo = business::formatMerchantLogo($currentInfo);
 			$list[$key]['smallAvatar'] = isset($currentInfo['smallLogoUrl']) ? $currentInfo['smallLogoUrl'] : '';
@@ -69,7 +69,7 @@ class CustomClass extends BaseClass
 		if (empty($custom)) {
 			util::fail('没有找到客户');
 		}
-		if ($custom['merchantId'] != $merchantId) {
+		if ($custom['sjId'] != $merchantId) {
 			util::fail('您没有权限操作此客户');
 		}
 	}

biz-ghs/custom/services/CustomService.php

@@ -35,15 +35,15 @@ class CustomService extends BaseService
         }
         $list = CustomClass::groupBaseInfo([$custom]);
         $custom = current($list);
-        $downShopId = $custom['downShopId'] ?? 0;
-        $downShop = \biz\merchant\classes\ShopClass::getById($downShopId);
-        $super = \biz\merchant\classes\ShopClass::getSuper($downShopId);
-        $custom['province'] = $downShop['province'] ?? '';
-        $custom['city'] = $downShop['city'] ?? '';
-        $custom['address'] = $downShop['address'] ?? '';
-        $custom['floor'] = $downShop['floor'] ?? '';
-        $custom['lat'] = $downShop['lat'] ?? '';
-        $custom['long'] = $downShop['long'] ?? '';
+        $customShopId = $custom['customShopId'] ?? 0;
+        $customShop = \biz\merchant\classes\ShopClass::getById($customShopId);
+        $super = \biz\merchant\classes\ShopClass::getSuper($customShopId);
+        $custom['province'] = $customShop['province'] ?? '';
+        $custom['city'] = $customShop['city'] ?? '';
+        $custom['address'] = $customShop['address'] ?? '';
+        $custom['floor'] = $customShop['floor'] ?? '';
+        $custom['lat'] = $customShop['lat'] ?? '';
+        $custom['long'] = $customShop['long'] ?? '';
         $custom['userName'] = $super['adminName'] ?? '';
         $custom['mobile'] = $super['mobile'] ?? '';
         return $custom;

biz-ty/sj/classes/MerchantClass.php

@@ -50,11 +50,11 @@ class MerchantClass extends BaseClass
 	
 	public static function getMerchantById($id)
 	{
-		$merchant = self::getById($id);
-		if (empty($merchant)) {
-			return $merchant;
+		$sj = self::getById($id);
+		if (empty($sj)) {
+			return $sj;
 		}
-		$list = self::groupBaseInfo([$merchant]);
+		$list = self::groupBaseInfo([$sj]);
 		return current($list);
 	}
 	
@@ -87,10 +87,10 @@ class MerchantClass extends BaseClass
 		$applyData['alipayAccountName'] = isset($applyData['alipayAccountName']) ? $applyData['alipayAccountName'] : '';
 		$applyData['agentLevel'] = 1;
 		$applyData['parentId'] = $applyData['introSjId'] ?? 0;
-		$merchant = self::add($applyData);
+		$sj = self::add($applyData);
 		
 		$adminId = $applyData['adminId'] ?? 0;
-		$merchantId = $merchant['id'];
+		$sjId = $sj['id'];
 		$mobile = $applyData['mobile'];
 		//生成资产
 		$assetData = [
@@ -106,7 +106,7 @@ class MerchantClass extends BaseClass
 			'totalRecharge' => 0,
 			'totalOrder' => 0,
 			'totalDeal' => 0,
-			'merchantId' => $merchantId,
+			'merchantId' => $sjId,
 			'totalIncome' => 0,
 			'totalExpend' => 0,
 		];
@@ -114,7 +114,7 @@ class MerchantClass extends BaseClass
 		
 		//生成商家拓展信息
 		$extendData = [
-			'merchantId' => $merchantId,
+			'merchantId' => $sjId,
 			'wxAppId' => isset($applyData['wxAppId']) ? $applyData['wxAppId'] : '',
 			'webTitle' => isset($applyData['merchantName']) ? $applyData['merchantName'] : '',
 			'webKeyword' => isset($applyData['merchantName']) ? $applyData['merchantName'] : '',
@@ -133,11 +133,11 @@ class MerchantClass extends BaseClass
 		];
 		MerchantExtendClass::add($extendData);
 		
-		MerchantInitClass::add(['merchantId' => $merchantId]);
+		MerchantInitClass::add(['merchantId' => $sjId]);
 		
 		//商家商品配置信息
 		$setData = [
-			'merchantId' => $merchantId,
+			'merchantId' => $sjId,
 			'riseType' => 0,
 			'riseAmount' => 0,
 		];
@@ -145,8 +145,8 @@ class MerchantClass extends BaseClass
 		
 		//创建门店
 		$shopData = [
-			'shopName' => $merchant['merchantName'],
-			'merchantId' => $merchantId,
+			'shopName' => $sj['merchantName'],
+			'merchantId' => $sjId,
 			'openTime' => '8:00 - 23:00',
 			'telephone' => $mobile,
 			'introduction' => '欢迎光临',
@@ -157,18 +157,18 @@ class MerchantClass extends BaseClass
 			'address' => isset($applyData['address']) ? $applyData['address'] : '',
 			'fullAddress' => isset($applyData['fullAddress']) ? $applyData['fullAddress'] : '',
 		];
-		$shopReturn = ShopClass::addShop($shopData);
-		$shopId = $shopReturn['id'];
+		$shopRespond = ShopClass::addShop($shopData);
+		$shopId = $shopRespond['id'];
 		//设置商家默认门店
-		MerchantClass::updateById($merchantId, ['defaultShopId' => $shopId]);
+		MerchantClass::updateById($sjId, ['defaultShopId' => $shopId]);
 		
 		if ($applyData['style'] == MerchantClass::STYLE_RETAIL) {
 			//创建管理员角色
 			$roleId = 0;
-			$hasRole = AdminRoleClass::getByCondition(['merchantId' => $merchantId]);
+			$hasRole = AdminRoleClass::getByCondition(['merchantId' => $sjId]);
 			if (empty($hasRole)) {
-				AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
-				$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
+				AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $sjId, 'auth' => '*']);
+				$roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
 				$roleId = $roleReturn['id'];
 			}
 			//创建管理员
@@ -184,7 +184,7 @@ class MerchantClass extends BaseClass
 					$shopData = [
 						'adminId' => $adminId,
 						'shopId' => $shopId,
-						'merchantId' => $merchantId,
+						'merchantId' => $sjId,
 						'remind' => 1,
 						'roleId' => $roleId,
 						'default' => 1,
@@ -196,7 +196,14 @@ class MerchantClass extends BaseClass
 				if ($applyData['introStyle'] == MerchantClass::STYLE_SUPPLIER) {
 					if ($applyData['style'] == MerchantClass::STYLE_RETAIL) {
 						$introSjId = $applyData['introSjId'];
-						$customData = [];
+						$customData = [
+							'customSjId' => $sjId,
+							'customShopId' => $shopId,
+							'sjId' => $applyData['introSjId'],
+							'name' => $applyData['name'],
+							'mobile' => $applyData['mobile'],
+							'isOpen' => 1,
+						];
 						CustomClass::addCustom($customData);
 					}
 				}
@@ -204,10 +211,10 @@ class MerchantClass extends BaseClass
 		} elseif ($applyData['style'] == MerchantClass::STYLE_SUPPLIER) {
 			//创建管理员角色
 			$roleId = 0;
-			$hasRole = \bizGhs\admin\classes\AdminRoleClass::getByCondition(['merchantId' => $merchantId]);
+			$hasRole = \bizGhs\admin\classes\AdminRoleClass::getByCondition(['merchantId' => $sjId]);
 			if (empty($hasRole)) {
-				\bizGhs\admin\classes\AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $merchantId, 'auth' => '*']);
-				$roleReturn = \bizGhs\admin\classes\AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $merchantId, 'auth' => '*']);
+				\bizGhs\admin\classes\AdminRoleClass::addAdminRole(['roleName' => '店员', 'merchantId' => $sjId, 'auth' => '*']);
+				$roleReturn = \bizGhs\admin\classes\AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
 				$roleId = $roleReturn['id'];
 			}
 			//创建管理员
@@ -225,7 +232,7 @@ class MerchantClass extends BaseClass
 					$shopData = [
 						'adminId' => $adminId,
 						'shopId' => $shopId,
-						'merchantId' => $merchantId,
+						'merchantId' => $sjId,
 						'remind' => 1,
 						'roleId' => $roleId,
 						'default' => 1,
@@ -239,14 +246,14 @@ class MerchantClass extends BaseClass
 		
 		if ($applyData['style'] == MerchantClass::STYLE_RETAIL) {
 			//商品和分类初始化
-			CategoryClass::initCategoryGoods($merchantId);
+			CategoryClass::initCategoryGoods($sjId);
 			//商城和门店广告初始化
-			AdClass::initAdd($merchantId);
+			AdClass::initAdd($sjId);
 			//优惠券资产与配置信息初始化
-			CouponAssetClass::add(['merchantId' => $merchantId, 'switch' => 1]);
+			CouponAssetClass::add(['merchantId' => $sjId, 'switch' => 1]);
 		}
 		
-		return $merchant;
+		return $sj;
 	}
 	
 	//h5商城链接二维码 shish 2020.4.30
@@ -259,9 +266,9 @@ class MerchantClass extends BaseClass
 		return isset($respond['url']) ? $respond['url'] : '';
 	}
 	
-	public static function getDefaultShopId($merchant)
+	public static function getDefaultShopId($sj)
 	{
-		$defaultShopId = isset($merchant['defaultShopId']) ? $merchant['defaultShopId'] : 0;
+		$defaultShopId = isset($sj['defaultShopId']) ? $sj['defaultShopId'] : 0;
 		return $defaultShopId;
 	}
 	

biz/saas/classes/ApplyClass.php

@@ -18,6 +18,12 @@ class ApplyClass extends BaseClass
 	const FROM_RETAIL = 1;
 	//来自供货商平台
 	const FROM_GHS = 2;
+	
+	const STATUS_CHECKING = 1;
+	const STATUS_PASS = 2;
+	const STATUS_UN_PASS = 3;
+	const STATUS_HAS_PAY = 4;
+	const STATUS_EXPIRE = 5;
 
 	//添加申请 shish 2020.2.10
 	public static function addApply($data)

biz/saas/services/ApplyService.php

@@ -64,6 +64,8 @@ class ApplyService extends BaseService
 		if (empty($apply)) {
 			util::fail('没有找到申请记录');
 		}
+		$applyId = $apply['id'];
+		ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS]);
 		unset($apply['id']);
 		$adminId = $apply['adminId'];
 		$admin = AdminClass::getById($adminId);
@@ -71,7 +73,7 @@ class ApplyService extends BaseService
 		$apply['adminName'] = $admin['adminName'] ?? '';
 		return MerchantClass::generateSj($apply);
 	}
-
+	
 	//申请开店 shish 2021.01.28
 	public static function addApply($data)
 	{
@@ -113,5 +115,5 @@ class ApplyService extends BaseService
 		$text .= "请及时跟进";
 		noticeUtil::push($text, '15280215347');
 	}
-
+	
 }

sql.sql

@@ -1232,4 +1232,11 @@ ALTER TABLE xhMerchant RENAME TO xhSj;
 ALTER TABLE xhMerchantAsset RENAME TO xhSjAsset;
 ALTER TABLE xhMerchantExtend RENAME TO xhSjExtend;
 ALTER TABLE xhMerchantInit RENAME TO xhSjInit;
-ALTER TABLE xhMerchantRemark RENAME TO xhSjRemark;
+ALTER TABLE xhMerchantRemark RENAME TO xhSjRemark;
+ALTER TABLE xhGhsCustom CHANGE downId `customSjId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户对应的商家id';
+ALTER TABLE xhGhsCustom CHANGE `downShopId` `customShopId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户对应的门店id';
+ALTER TABLE xhGhsCustom CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '供货商的商家id';
+ALTER TABLE xhGhsCustom DROP COLUMN `addTime`;
+ALTER TABLE xhGhsCustom DROP COLUMN `updateTime`;
+ALTER TABLE xhGhsCustom ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `buyAmount`;
+ALTER TABLE xhGhsCustom ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;