Browse Source

添加门店

shish 6 years ago
parent
commit
63b954603a

+ 7 - 5
app/saas/controllers/WxOpenController.php

@@ -1,8 +1,10 @@
 <?php
+
 namespace saas\controllers;
 
 use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
+use biz\weixin\services\MiniProgramService;
 use common\components\util;
 use Yii;
 use common\components\wxUtil;
@@ -22,7 +24,7 @@ class WxOpenController extends BaseController
 		$wxAppId = $merchant['wxAppId'];
 		$miniAppId = $merchant['miniAppId'];
 		$open_appid = $merchant['openAppId'];
-
+		
 		echo "<pre>";
 		
 		$id = Yii::$app->request->get('id', 0);
@@ -34,14 +36,14 @@ class WxOpenController extends BaseController
 			if ($return['errcode'] == 0) {
 				$openAppId = $return['open_appid'];
 				MerchantService::updateById($merchantId, ['openAppId' => $openAppId]);
-				MerchantExtendService::updateByCondition(['merchantId'=>$merchantId],['openAppId'=>$openAppId,'openAppBind'=>1,'wxAuth'=>1]);
+				MerchantExtendService::updateByCondition(['merchantId' => $merchantId], ['openAppId' => $openAppId, 'openAppBind' => 1, 'wxAuth' => 1]);
 			}
 		}
 		//将小程序绑定到平台
 		if ($id == 2) {
 			$openAppId = $merchant['openAppId'];
 			$r = wxUtil::bindOpenAccount($miniAppId, $openAppId, $merchant, true);
-			MerchantExtendService::updateByCondition(['merchantId'=>$merchantId],['openAppBind'=>3,'miniAuth'=>1]);
+			MerchantExtendService::updateByCondition(['merchantId' => $merchantId], ['openAppBind' => 3, 'miniAuth' => 1]);
 			print_r($r);
 		}
 		//查询公众号 小程序的绑定情况
@@ -91,7 +93,7 @@ class WxOpenController extends BaseController
 		
 		//发布已通过审核的小程序
 		if ($id == 11) {
-			wxUtil::miniRelease($merchant);
+			MiniProgramService::release($merchant);
 		}
 		
 		//撤回审核
@@ -142,7 +144,7 @@ class WxOpenController extends BaseController
 		echo "<br />open_appid:" . $open_appid . "<br />";
 		if (!empty($open_appid)) {
 			xhMerchantService::updateById($merchantId, ['openAppId' => $open_appid]);
-			MerchantExtendService::updateByCondition(['merchantId'=>$merchantId],['openAppId'=>$open_appid,'openAppBind'=>3,'miniAuth'=>1]);
+			MerchantExtendService::updateByCondition(['merchantId' => $merchantId], ['openAppId' => $open_appid, 'openAppBind' => 3, 'miniAuth' => 1]);
 			$r = wxUtil::bindOpenAccount($miniAppId, $open_appid, $merchant);
 			echo "绑定小程序结果:<br />";
 			print_r($r);

+ 5 - 3
biz/merchant/classes/MerchantClass.php

@@ -130,8 +130,10 @@ class MerchantClass extends BaseClass
 			'updateTime' => $date,
 		];
 		MerchantExtendClass::add($extendData);
-		
-		//商家商品统一配置
+
+		MerchantInitClass::add(['merchantId'=>$merchantId]);
+
+		//商家商品配置信息
 		$setData = [
 			'merchantId' => $merchantId,
 			'riseType' => 0,
@@ -139,7 +141,7 @@ class MerchantClass extends BaseClass
 			'addTime' => time(),
 		];
 		GoodsSettingClass::add($setData);
-		
+
 		//创建门店
 		$shopData = [
 			'shopName' => $merchant['merchantName'],

+ 30 - 0
biz/merchant/classes/MerchantInitClass.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace biz\merchant\classes;
+
+use biz\ad\classes\AdClass;
+use biz\admin\classes\AdminRoleClass;
+use biz\coupon\classes\CouponAssetClass;
+use biz\goods\classes\CategoryClass;
+use biz\goods\classes\GoodsSettingClass;
+use common\components\business;
+use common\components\stringUtil;
+use Yii;
+use biz\base\classes\BaseClass;
+
+class MerchantInitClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\merchant\models\MerchantInit';
+
+	public static function getByMerchantId($id)
+	{
+		return self::getByCondition(['merchantId' => $id]);
+	}
+
+	public static function updateByMerchantId($id, $data)
+	{
+		return self::updateByCondition(['merchantId' => $id], $data);
+	}
+	
+}

+ 36 - 0
biz/merchant/classes/ShopClass.php

@@ -2,7 +2,9 @@
 
 namespace biz\merchant\classes;
 
+use common\components\dirUtil;
 use common\components\util;
+use common\components\wxUtil;
 use Yii;
 use biz\base\classes\BaseClass;
 
@@ -78,4 +80,38 @@ class ShopClass extends BaseClass
 		self::updateById($id, ['delStatus' => 1]);
 	}
 	
+	//生成门店的会员注册二维码 shish 2020.3.9
+	public static function generateMemberCode($shop, $merchant)
+	{
+		$id = $shop['id'];
+		$noCode = false;
+		if (empty($shop['applyMemberCode'])) {
+			$noCode = true;
+		} else {
+			$file = dirUtil::getImgDir() . $shop['applyMemberCode'];
+			if (file_exists($file) == false) {
+				$noCode = true;
+			}
+		}
+		if ($noCode) {
+			$path = 'pages/home/user?scan=1&shopId=' . $id;
+			$img = wxUtil::generateMemberCode($merchant, $path);
+			self::updateById($id, ['applyMemberCode' => $img]);
+		}
+	}
+	
+	//商家所有门店生成注册会员码 shish 2020.3.9
+	public static function generateAllMemberCode($merchant)
+	{
+		$merchantId = $merchant['id'];
+		$shopList = self::getAllByCondition(['merchantId' => $merchantId]);
+		if (empty($shopList)) {
+			return false;
+		}
+		foreach ($shopList as $shop) {
+			self::generateMemberCode($shop, $merchant);
+		}
+		MerchantInitClass::updateByMerchantId($merchantId, ['memberCodeInit' => 1]);
+	}
+
 }

+ 13 - 0
biz/merchant/models/MerchantInit.php

@@ -0,0 +1,13 @@
+<?php
+namespace biz\merchant\models;
+use biz\base\models\Base;
+
+class MerchantInit extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhMerchantInit';
+	}
+
+}

+ 30 - 0
biz/merchant/services/MerchantInitService.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace biz\merchant\services;
+
+use biz\admin\classes\AdminRoleClass;
+use biz\auth\services\AuthService;
+use biz\base\services\BaseService;
+use biz\merchant\classes\AdminClass;
+use biz\merchant\classes\MerchantAssetClass;
+use biz\merchant\classes\MerchantClass;
+use biz\merchant\classes\MerchantExtendClass;
+use biz\merchant\classes\ShopClass;
+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 common\components\business;
+use common\components\util;
+use common\services\xhTMessageService;
+use common\services\xhWxMenuService;
+use Yii;
+
+class MerchantInitService extends BaseService
+{
+
+	public static $baseFile = '\biz\merchant\classes\MerchantInitClass';
+
+}

+ 12 - 6
biz/weixin/classes/MiniProgramClass.php

@@ -2,23 +2,29 @@
 
 namespace biz\weixin\classes;
 
+use biz\merchant\classes\MerchantInitClass;
+use biz\merchant\classes\ShopClass;
 use common\components\wxUtil;
 use Yii;
 use biz\base\classes\BaseClass;
 
 class MiniProgramClass extends BaseClass
 {
-
+	
 	public static $baseFile = '\biz\weixin\models\MiniProgram';
-
+	
 	//发布小程序 shish 2020.3.9
 	public static function release($merchant)
 	{
 		$respond = wxUtil::miniRelease($merchant);
-		//发布成功
-		if(isset($respond['errcode']) && $respond['errcode'] == 0){
-
+		//发布成功,商家所有的门店生成注册会员的二维码
+		if (isset($respond['errcode']) && $respond['errcode'] == 0) {
+			$merchantId = $merchant['id'];
+			$init = MerchantInitClass::getByMerchantId($merchantId);
+			if ($init['memberCodeInit'] == 0) {
+				ShopClass::generateAllMemberCode($merchant);
+			}
 		}
 	}
-
+	
 }

+ 3 - 2
biz/weixin/services/MiniProgramService.php

@@ -10,12 +10,13 @@ use Yii;
 
 class MiniProgramService extends BaseService
 {
-	
+
 	public static $baseFile = '\biz\weixin\classes\MiniProgramClass';
 	
+	//发布已经审核通过的小程序 shish 2020.3.9
 	public static function release($merchant)
 	{
 		return MiniProgramClass::release($merchant);
 	}
-
+	
 }

+ 2 - 2
common/components/wxUtil.php

@@ -1380,7 +1380,7 @@ class wxUtil
 	}
 	
 	//申请会员的小程序码
-	public static function generateMemberCode($merchant, $path = 'pages/home/user?scan=1')
+	public static function generateMemberCode($merchant, $path)
 	{
 		$accessToken = self::getMiniProgramAccessToken($merchant);
 		$url = "https://api.weixin.qq.com/wxa/getwxacode?access_token={$accessToken}";
@@ -1390,7 +1390,7 @@ class wxUtil
 			"width" => 1000,
 		];
 		$result = $curl->setOption(CURLOPT_POSTFIELDS, Json::encode($data))->post($url);
-		$behind = '/retail/miniExperience/' . $merchant['id'] . '_apply_member.jpg';
+		$behind = '/retail/mimiMemberCode/' . $merchant['id'] . '_apply_member.jpg';
 		$file = dirUtil::getImgDir() . $behind;
 		file_put_contents($file, $result);
 		return $behind;

+ 8 - 0
console/controllers/UpgradeController.php

@@ -1167,6 +1167,14 @@ UPDATE xhUser SET delStatus=1 WHERE merchantId=0;";
 ) ENGINE=INNODB AUTO_INCREMENT=12566 DEFAULT CHARSET=utf8 COMMENT='小程序';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 
+		$sql = "CREATE TABLE IF NOT EXISTS `xhMerchantInit`(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+`memberCodeInit` TINYINT NOT NULL DEFAULT 0 COMMENT '会员注册码初始过 0 没有 1有',
+`addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
+) COMMENT='商家初始信息';";
+		Yii::$app->db->createCommand($sql)->execute($sql);
+
 	}
 
 	//数据迁移 shish 2020.1.12