获取收款码等

app/saas/controllers/MerchantController.php

@@ -42,7 +42,7 @@ class MerchantController extends BaseController
 		$merchant = MerchantService::getMerchantById(12358);
 		util::success($merchant);
 	}
-
+	
 	//开放平台设置相关操作 shish 2020.1.18
 	public function actionBindOpen()
 	{
@@ -96,7 +96,7 @@ class MerchantController extends BaseController
 			$tId = Yii::$app->request->get('tId');
 			wxUtil::miniCommit($merchant, $tId);
 		}
-
+		
 		//获取小程序体验码
 		if ($id == 6) {
 			wxUtil::getExperienceQrCode($merchant);
@@ -188,4 +188,10 @@ class MerchantController extends BaseController
 		print_r($return);
 	}
 
+	//平台帐号激活 shish 2020.2.15
+	public function actionAddPlatformMerchant()
+	{
+		echo 'ok';
+	}
+
 }

app/saas/controllers/OrderController.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace saas\controllers;
+
 use biz\order\services\OrderService;
 use biz\retail\services\RetailAssetService;
 use Yii;
@@ -7,7 +9,7 @@ use common\components\util;
 
 class OrderController extends BaseController
 {
-
+	
 	public function actionList()
 	{
 		$get = Yii::$app->request->get();
@@ -18,5 +20,11 @@ class OrderController extends BaseController
 		$list['asset'] = $asset;
 		util::success($list);
 	}
+	
+	//收款码 shish 2020.2.15
+	public function actionGatheringCode()
+	{
+		echo 'ok';
+	}
 
 }

app/saas/controllers/UserController.php

@@ -57,4 +57,10 @@ class UserController extends BaseController
 		util::success($list);
 	}
 	
+	//会员申请码查看 shish 2020.2.15
+	public function actionApplyCode()
+	{
+		echo 'ok';
+	}
+
 }

app/www/controllers/WxOpenController.php

@@ -158,6 +158,7 @@ class WxOpenController extends PublicController
 		$upData['wxRefreshToken'] = $authorize_refresh_token;
 		$upData['status'] = 1;//审核通过
 		xhMerchantService::updateById($id, $upData);
+		MerchantExtendClass::updateByCondition(['merchantId' => $id], ['wxAppId' => $authorizeAppId]);
 		
 		//还没有完成初始化先进行初始化
 		$extend = MerchantExtendClass::getByMerchantId($id);

biz/merchant/classes/MerchantClass.php

@@ -4,6 +4,7 @@ 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;
@@ -136,7 +137,7 @@ class MerchantClass extends BaseClass
 			'addTime' => time(),
 		];
 		GoodsSettingClass::add($setData);
-
+		
 		//创建门店
 		$shopData = [
 			'shopName' => $merchant['merchantName'],
@@ -184,15 +185,18 @@ class MerchantClass extends BaseClass
 			];
 			AdminClass::addAdmin($adminData);
 		}
-		
+
 		//商品和分类初始化
 		CategoryClass::initCategoryGoods($merchantId);
-		
+
 		//商城和门店广告初始化
 		AdClass::initAdd($merchantId);
-		
+
+		//优惠券资产与配置信息初始化
+		CouponAssetClass::add(['merchantId' => $merchantId, 'switch' => 1]);
+
 		//微信支付和支付宝支付
-		
+
 		return $merchant;
 	}
 	

console/controllers/UpgradeController.php

@@ -1100,6 +1100,11 @@ ALTER TABLE `xhApply` CHANGE `latitude` `lat` VARCHAR(20) NOT NULL DEFAULT '' CO
 ALTER TABLE `xhAd` MODIFY `startTime` BIGINT NOT NULL DEFAULT 0 COMMENT '开始时间';";
 		Yii::$app->db->createCommand($sql)->execute();
 
+		//支付相关配置修改
+		$sql = "ALTER TABLE `xhMerchantExtend` ADD wxPayInit TINYINT NOT NULL DEFAULT 0 COMMENT '0微信支付未配置 1配置' AFTER `miniVersion`;
+ALTER TABLE `xhMerchantExtend` ADD alipayInit TINYINT NOT NULL DEFAULT 0 COMMENT '0支付宝支付未配置 1配置' AFTER `wxPayKey`;";
+		Yii::$app->db->createCommand($sql)->execute();
+
 	}
 	
 	//重新拉取并保存国兰客户的头像和图片 shish 2020.1.12