供货商提申请

app/ghs/controllers/CustomController.php

@@ -66,7 +66,7 @@ class CustomController extends BaseController
     public function actionAdd()
     {
         $get = Yii::$app->request->get();
-        ApplyService::addCustom($get);
+        ApplyService::addCustom($get,$this->ghsId);
         util::complete('已提交审核');
     }
 

biz/merchant/classes/MerchantClass.php

@@ -26,6 +26,11 @@ class MerchantClass extends BaseClass
         2 => ['id' => 2, 'url' => '/mall/index?account=12358', 'img' => 'http://a.huahb.com/images/avatar.jpg', 'sign' => 'mall', 'name' => '申请会员'],
         3 => ['id' => 3, 'url' => '/mall/index?account=12358', 'img' => 'http://a.huahb.com/images/avatar.jpg', 'sign' => 'mall', 'name' => '点我付款'],
     ];
+    
+    //零售类型
+    const STYLE_RETAIL = 0;
+    //供货商类型
+    const STYLE_SUPPLIER = 1;
 
     //商家信息组合 shish 2019.12.20
     public static function groupMerchantBaseInfo($list)

biz/saas/services/ApplyService.php

@@ -51,7 +51,7 @@ class ApplyService extends BaseService
 		$data['list'] = $list;
 		return $data;
 	}
-
+	
 	//审核通过
 	public static function pass($id)
 	{
@@ -65,54 +65,54 @@ class ApplyService extends BaseService
 		$apply['adminName'] = isset($admin['adminName']) ? $admin['adminName'] : '';
 		return MerchantClass::generateMerchant($apply);
 	}
-
+	
 	//新增推荐 shish 2020.2.27
 	public static function addApply($data)
 	{
-        $mobile = isset($data['mobile']) ? $data['mobile'] : 0;
-        if (stringUtil::isMobile($mobile) == false) {
-            util::fail('请填写手机号');
-        }
-        $apply = self::getByCondition(['mobile' => $mobile]);
-        if (!empty($apply)) {
-            util::fail('手机号已被使用');
-        }
-        $apply = self::getByCondition(['adminId' => $data['adminId']]);
-        if (!empty($apply)) {
-            util::fail('您已申请过了');
-        }
-        $shopAdmin = ShopAdminClass::getByCondition(['adminId' => $data['adminId']]);
-        if (!empty($shopAdmin)) {
-            util::fail('您已经有门店了');
-        }
-        $prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
-        $dist = isset($data['dist']) ? $data['dist'] : '';
-        $floor = isset($data['floor']) ? $data['floor'] : '';
-        $data['fullAddress'] = $prefix . $dist . $data['address'] . $floor;
-        $mobile = $data['mobile'];
-        noticeUtil::push('客户 ' . $mobile . ' 已提交开店资料，请及时跟进','15280215347');
-        return ApplyClass::addApply($data);
+		$mobile = isset($data['mobile']) ? $data['mobile'] : 0;
+		if (stringUtil::isMobile($mobile) == false) {
+			util::fail('请填写手机号');
+		}
+		$apply = self::getByCondition(['mobile' => $mobile]);
+		if (!empty($apply)) {
+			util::fail('手机号已被使用');
+		}
+		$apply = self::getByCondition(['adminId' => $data['adminId']]);
+		if (!empty($apply)) {
+			util::fail('您已申请过了');
+		}
+		$shopAdmin = ShopAdminClass::getByCondition(['adminId' => $data['adminId']]);
+		if (!empty($shopAdmin)) {
+			util::fail('您已经有门店了');
+		}
+		$prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
+		$dist = isset($data['dist']) ? $data['dist'] : '';
+		$floor = isset($data['floor']) ? $data['floor'] : '';
+		$data['fullAddress'] = $prefix . $dist . $data['address'] . $floor;
+		$mobile = $data['mobile'];
+		noticeUtil::push('客户 ' . $mobile . ' 已提交开店资料，请及时跟进', '15280215347');
+		return ApplyClass::addApply($data);
 	}
-
+	
 	//新增客户 shish 2021.1.10
-	public static function addCustom($data)
-    {
-        $mobile = isset($data['mobile']) ? $data['mobile'] : 0;
-        if (stringUtil::isMobile($mobile) == false) {
-            util::fail('请填写手机号');
-        }
-        $apply = self::getByCondition(['mobile' => $mobile]);
-        if (!empty($apply)) {
-            util::fail('手机号已被使用');
-        }
-        $prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
-        $dist = isset($data['dist']) ? $data['dist'] : '';
-        $floor = isset($data['floor']) ? $data['floor'] : '';
-        $data['fullAddress'] = $prefix . $dist . $data['address'] . $floor;
-        $mobile = $data['mobile'];
-        noticeUtil::push('客户 ' . $mobile . ' 已由供货商提交开店资料，请及时跟进','15280215347');
-
-        return ApplyClass::addApply($data);
-    }
+	public static function addCustom($data, $ghsId)
+	{
+		$mobile = isset($data['mobile']) ? $data['mobile'] : 0;
+		if (stringUtil::isMobile($mobile) == false) {
+			util::fail('请填写手机号');
+		}
+		$apply = self::getByCondition(['mobile' => $mobile]);
+		if (!empty($apply)) {
+			util::fail('手机号已被使用');
+		}
+		$prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
+		$dist = isset($data['dist']) ? $data['dist'] : '';
+		$floor = isset($data['floor']) ? $data['floor'] : '';
+		$data['fullAddress'] = $prefix . $dist . $data['address'] . $floor;
+		$mobile = $data['mobile'];
+		noticeUtil::push('客户 ' . $mobile . ' 已由供货商提交开店资料，请及时跟进', '15280215347');
 
+		return ApplyClass::addApply($data);
+	}
+	
 }

sql.sql

@@ -210,4 +210,10 @@ ALTER TABLE `xhGhsCustom` ADD buyNum INT NOT NULL DEFAULT 0 COMMENT '消费次
 ALTER TABLE `xhGhsCustom` ADD buyAmount DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '消费总金额' AFTER `buyNum`;
 ALTER TABLE xhGhsShopAdmin CHANGE merchantId `ghsId` INT NOT NULL DEFAULT 0 COMMENT '供货商id merchantId';
 ALTER TABLE xhApply ADD updateTime INT NOT NULL DEFAULT 0 COMMENT '修改时间' AFTER `addTime`;
-ALTER TABLE xhApply ADD `from` TINYINT NOT NULL DEFAULT 0 COMMENT '来源 0花店自己申请 1供货商发起' AFTER `introMerchantId`;
+ALTER TABLE xhApply ADD `from` TINYINT NOT NULL DEFAULT 0 COMMENT '来源 0花店自己申请 1供货商发起' AFTER `introMerchantId`;
+
+==shish 2021.1.12
+ALTER TABLE `xhApply` ADD introStyle TINYINT NOT NULL DEFAULT 0 COMMENT '介绍的商家类型 同 xhMerchant style' AFTER `introMerchantId`;
+ALTER TABLE `xhMerchant` MODIFY `style` TINYINT NOT NULL DEFAULT 0 COMMENT '商家类型 0零售 1 供货';
+ALTER TABLE `xhMerchant` ADD `property` TINYINT NOT NULL DEFAULT 0 COMMENT '商家属性 0零售 1 供货' AFTER `style`;
+ALTER TABLE `xhMerchant` MODIFY `property` TINYINT NOT NULL DEFAULT 0 COMMENT '平台微信取用类型 0普通 1零售商使用 2供货商使用';