获取平台的小程序appId

app/ghs/controllers/WxBaseController.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace ghs\controllers;
+
+use common\components\jsSDK;
+use common\components\util;
+use Yii;
+
+class WxBaseController extends BaseController
+{
+
+}

app/ghs/controllers/WxOpenController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace ghs\controllers;
+
+use bizTy\wx\classes\WxOpenClass;
+use common\components\jsSDK;
+use common\components\util;
+use Yii;
+
+class WxOpenController extends BaseController
+{
+
+	//获取小程序信息 shish 2021.2.25
+	public function actionGetMiniInfo()
+	{
+		$respond = WxOpenClass::getMiniInfo();
+		util::success($respond);
+	}
+
+}

app/shop/controllers/WxOpenController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace shop\controllers;
+
+use bizTy\wx\classes\WxOpenClass;
+use common\components\jsSDK;
+use common\components\util;
+use Yii;
+
+class WxOpenController extends BaseController
+{
+
+	//获取小程序信息 shish 2021.2.25
+	public function actionGetMiniInfo()
+	{
+		$respond = WxOpenClass::getMiniInfo();
+		util::success($respond);
+	}
+
+}

biz-ty/wx/classes/WxMiniBaseClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizTy\wx\classes;
+
+use Yii;
+use bizTy\base\classes\BaseClass;
+
+class WxMiniBaseClass extends BaseClass
+{
+	
+	public static $baseFile = '\bizTy\wx\models\WxMiniBase';
+	
+}

biz-ty/wx/classes/WxOpenClass.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace bizTy\wx\classes;
+
+use bizTy\sj\classes\MerchantClass;
+use common\components\util;
+use Yii;
+use bizTy\base\classes\BaseClass;
+
+class WxOpenClass extends BaseClass
+{
+	
+	public static $baseFile = '\bizTy\wx\models\WxOpen';
+	
+	const OPEN_STYLE_RETAIL = 1;
+	const OPEN_STYLE_GHS = 2;
+	
+	//获取所有的小程序信息 shish 2021.2.25
+	public static function getMiniInfo()
+	{
+		$ghsOpen = self::getGhsOpen();
+		$wxGhsMiniBaseId = $ghsOpen['wxGhsMiniBaseId'] ?? 0;
+		$arr = [];
+		$ghsMini = WxMiniBaseClass::getById($wxGhsMiniBaseId);
+		$arr['ghs']['miniAppId'] = $ghsMini['miniAppId'] ?? '';
+		$retailOpen = self::getRetailOpen();
+		$wxMiniBaseId = $retailOpen['wxMiniBaseId'] ?? 0;
+		$wxMini = WxMiniBaseClass::getById($wxGhsMiniBaseId);
+		$arr['retail']['miniAppId'] = $wxMini['miniAppId'] ?? '';
+		return $arr;
+	}
+	
+	//取供货商平台信息 shish 2021.2.25
+	public static function getGhsOpen()
+	{
+		//暂时只有一个平台，取一个平台
+		return self::getByCondition(['style' => self::OPEN_STYLE_RETAIL]);
+	}
+	
+	//取零售平台信息 shish 2021.2.25
+	public static function getRetailOpen()
+	{
+		return self::getByCondition(['style' => self::OPEN_STYLE_RETAIL]);
+	}
+	
+}

biz-ty/wx/models/WxMiniBase.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizTy\wx\models;
+
+use bizTy\base\models\Base;
+
+class WxMiniBase extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhWxMiniBase';
+	}
+	
+}

biz-ty/wx/models/WxOpen.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizTy\wx\models;
+use bizTy\base\models\Base;
+
+class WxOpen extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhWxOpen';
+	}
+
+}

biz-ty/wx/services/WxMiniBaseService.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace bizTy\wx\services;
+
+use bizTy\base\services\BaseService;
+use bizTy\wx\classes\WxOpenClass;
+use Yii;
+
+class WxMiniBaseService extends BaseService
+{
+	
+	public static $baseFile = '\bizTy\wx\classes\WxMiniBaseClass';
+	
+}

biz-ty/wx/services/WxOpenService.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace bizTy\wx\services;
+
+use bizTy\base\services\BaseService;
+use bizTy\wx\classes\WxOpenClass;
+use Yii;
+
+class WxOpenService extends BaseService
+{
+
+	public static $baseFile = '\bizTy\wx\classes\WxOpenClass';
+
+}

biz/saas/services/ApplyService.php

@@ -79,7 +79,7 @@ class ApplyService extends BaseService
 	{
 		$style = $data['style'] ?? 0;
 		if (in_array($style, [MerchantClass::STYLE_RETAIL, MerchantClass::STYLE_SUPPLIER]) == false) {
-			util::fail('请确认开店资料');
+			util::fail('请确认商家类型');
 		}
 		$mobile = $data['mobile'] ?? 0;
 		if (empty($mobile)) {
@@ -97,7 +97,7 @@ class ApplyService extends BaseService
 		$adminId = $data['adminId'] ?? 0;
 		$from = $data['from'] ?? 0;
 		if (in_array($from, [ApplyClass::FROM_GHS, ApplyClass::FROM_RETAIL]) == false) {
-			util::fail('请确认开店资料是否完整！');
+			util::fail('申请没有填写来源');
 		}
 		$prefix = $data['province'] == $data['city'] ? $data['province'] : $data['province'] . $data['city'];
 		$dist = $data['dist'] ?? '';

sql.sql

@@ -1267,4 +1267,5 @@ ADD COLUMN `shopNo`  varchar(100) NOT NULL DEFAULT '' COMMENT '门店' AFTER `ap
 
 ALTER TABLE xhApply ADD `licenseNo` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '营业执照号码' AFTER `name`;
 ALTER TABLE xhApply ADD `certType` TINYINT(4) NOT NULL DEFAULT '1' COMMENT '证件类型 1营业执照 2身份证号 3手机号' AFTER `licenseNo`;
-ALTER TABLE xhApplyExtend DROP COLUMN `certType`;
+ALTER TABLE xhApplyExtend DROP COLUMN `certType`;
+ALTER TABLE xhWxOpen ADD `style` TINYINT NOT NULL DEFAULT 1 COMMENT '平台类型 1零售 2供货' AFTER `appSecret`;