shish %!s(int64=6) %!d(string=hai) anos
pai
achega
1ddd5cbce1

+ 0 - 4
app/www/controllers/MerchantController.php

@@ -52,10 +52,6 @@ class MerchantController extends BaseController
 	//平台帐号激活 shish 2020.2.15
 	public function actionAddPlatformMerchant()
 	{
-		$date = date("Y-m-d H:i:s");
-		MerchantClass::add(['merchantName'=>rand(1111,9999),'createTime'=>$date]);
-		die;
-
 		MerchantService::initOpenMerchant();
 		echo 'ok';
 	}

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

@@ -78,8 +78,10 @@ class MerchantClass extends BaseClass
 		$data['alipayAccountName'] = isset($data['alipayAccountName']) ? $data['alipayAccountName'] : '';
 		//默认设置为代理商
 		$data['agentLevel'] = 1;
+		//申请表的id去掉,商家有自己的id
+		unset($data['id']);
 		$merchant = self::add($data);
-		
+
 		$merchantId = $merchant['id'];
 		$mobile = $data['mobile'];