通知相关sql

biz/message/services/InformAdminService.php

@@ -16,7 +16,7 @@ class InformAdminService extends BaseService
 	
 	public static $baseFile = '\biz\message\classes\InformAdminClass';
 	
-	//通知到员工 shish 2020.1.1
+	//通知员工 shish 2020.1.1
 	public static function addInform($merchantId, $type, $params)
 	{
 		$adminList = AdminClass::getAllNoticeAdmin($merchantId);
@@ -25,7 +25,7 @@ class InformAdminService extends BaseService
 		}
 		//本地环境不进行通知
 		if (getenv('YII_ENV') == 'local') {
-			//return false;
+			return false;
 		}
 		$TMList = xhTMessageService::getList($merchantId);
 		foreach ($adminList as $adminKey => $admin) {
@@ -60,28 +60,22 @@ class InformAdminService extends BaseService
 		}
 		
 		//存入数据库
-		if ($hasSend) {
-			$informData = [
-				'userId' => $admin['userId'],
-				'adminId' => $id,
-				'merchantId' => $merchantId,
-				'noticeType' => 0,
-				'content' => $data['briefContent'],
-				'noticeWay' => $noticeWay,
-				'status' => 1,
-				'sourceType' => 0,
-				'sourceId' => 0,
-				'addTime' => time(),
-				'createTime' => date("Y-m-d H:i:s"),
-			];
-			InformAdminService::addData($informData);
-		}
-	}
-	
-	//添加记录 shish 2020.1.8
-	public static function addData($data)
-	{
-		return InformAdminClass::addData($data);
+		$hasSend = 0;
+		$informData = [
+			'userId' => $admin['userId'],
+			'adminId' => $id,
+			'merchantId' => $merchantId,
+			'noticeType' => 0,
+			'content' => $data['briefContent'],
+			'noticeWay' => $noticeWay,
+			'status' => 1,
+			'sourceType' => 0,
+			'sourceId' => 0,
+			'addTime' => time(),
+			'createTime' => date("Y-m-d H:i:s"),
+		];
+		InformAdminClass::addData($informData);
+		
 	}
 	
 }

common/services/xhMerchantAssetService.php

@@ -19,284 +19,292 @@ use common\services\xhOrderGoodsService;
 
 class xhMerchantAssetService
 {
+	
+	public static function getByMerchantId($id)
+	{
+		$condition = ['merchantId' => $id];
+		$merchant = xhMerchantAsset::getByCondition($condition);
+		return $merchant;
+	}
+	
+	/**
+	 * 资产初始化，计算总量保存到xhMerchantAsset
+	 */
+	public static function assetInit($merchantId)
+	{
+		set_time_limit(0);
+		//计算总收入
+		$income = Yii::$app->db->createCommand("SELECT SUM(amount) as totalIncome FROM xhMerchantCapital WHERE io=1 and merchantId={$merchantId}")->queryOne();
+		$totalIncome = $income['totalIncome'];
+		//计算总粉丝数
+		$totalFans = xhUser::find()->andWhere(['subscribe' => 1, 'merchantId' => $merchantId])->count('id');
+		//计算访问总量
+		$visit = Yii::$app->db->createCommand("SELECT SUM(riseNum) as num FROM xhStatVisitByDay WHERE merchantId={$merchantId}")->queryOne();
+		$totalVisit = $visit['num'];
+		//计算总交易量
+		$totalDeal = xhMerchantCapital::find()->andWhere(['io' => 1, 'merchantId' => $merchantId])->count('id');
+		$data = ['totalDeal' => $totalDeal, 'totalVisit' => $totalVisit, 'totalFans' => $totalFans, 'totalIncome' => $totalIncome];
+		self::updateByMerchantId($merchantId, $data);
+	}
+	
+	public static function updateByMerchantId($merchantId, $data)
+	{
+		xhMerchantAsset::updateByCondition(['merchantId' => $merchantId], $data);
+		return self::refreshByMerchantId($merchantId);
+	}
+	
+	public static function refreshByMerchantId($merchantId)
+	{
+		$key = configDict::getCacheKey('merchantAsset') . $merchantId;
+		Yii::$app->redis->executeCommand('DEL', [$key]);
+		return self::getByMerchantId($merchantId);
+	}
+	
+	//收入后资产变更 shish 2019.12.24
+	public static function incomeChangeAsset($merchant, $merchantAsset, $updateData, $order, $capitalType)
+	{
+		$merchantId = $merchant['id'];
+		$openMerchant = xhWxOpenService::getMerchant();
+		$openMerchantId = $openMerchant['id'];
+		$orderId = $order['id'];
+		$date = date("Y-m-d H:i");
+		$totalFee = 0;
+		$payWayList = configDict::getConfig('payWayName');
+		$payWay = isset($order['payWay']) ? $order['payWay'] : 0;
+		$payWay = $payWayList[$payWay];
+		$userId = isset($order['userId']) ? $order['userId'] : 0;
+		$user = xhUserService::getById($userId);
+		$userName = isset($user['userName']) ? $user['userName'] : '游客';
+		//充值支付涉及的流水类型列表
+		$typeList = configDict::getConfig('capitalType');
+		//根据流水类型定制通知内容
+		switch ($capitalType) {
+			//购买商品
+			case $typeList['xhOrder']['id']:
+				$totalFee = $order['actPrice'];
+				$goodsList = xhOrderGoodsService::getAllByOrderId($orderId);
+				if (!empty($goodsList)) {
+					foreach ($goodsList as $goodsKey => $goodsVal) {
+						$goodsId = $goodsVal['goodsId'];
+						$goods = xhGoodsService::getById($goodsId);
+						if (!empty($goods)) {
+							$actualSold = stringUtil::calcAdd($goods['actualSold'], 1);
+							xhGoodsService::updateById($goodsId, ['actualSold' => $actualSold]);//商品被售出数量+1
+						}
+					}
+				}
+				//sourceType 0商城 1门店 2微信朋友圈 3美团
+				if ($order['sourceType'] == 0) {
+					//商城下单通知
+					$data = [];
+					InformAdminService::goodsSoldInformAdmin($data);
+				} elseif ($order['sourceType'] == 1) {
+					//门店收入通知
+					$data = [];
+					InformAdminService::shopIncomeInformAdmin($data);
+				} elseif ($order['sourceType'] == 2) {
+					//美团收入通知
+					$data = [];
+					InformAdminService::meiTuanIncomeInformAdmin($data);
+				} else {
 
-    public static function getByMerchantId($id)
-    {
-        $condition = ['merchantId' => $id];
-        $merchant = xhMerchantAsset::getByCondition($condition);
-        return $merchant;
-    }
-
-    /**
-     * 资产初始化，计算总量保存到xhMerchantAsset
-     */
-    public static function assetInit($merchantId)
-    {
-        set_time_limit(0);
-        //计算总收入
-        $income = Yii::$app->db->createCommand("SELECT SUM(amount) as totalIncome FROM xhMerchantCapital WHERE io=1 and merchantId={$merchantId}")->queryOne();
-        $totalIncome = $income['totalIncome'];
-        //计算总粉丝数
-        $totalFans = xhUser::find()->andWhere(['subscribe' => 1, 'merchantId' => $merchantId])->count('id');
-        //计算访问总量
-        $visit = Yii::$app->db->createCommand("SELECT SUM(riseNum) as num FROM xhStatVisitByDay WHERE merchantId={$merchantId}")->queryOne();
-        $totalVisit = $visit['num'];
-        //计算总交易量
-        $totalDeal = xhMerchantCapital::find()->andWhere(['io' => 1, 'merchantId' => $merchantId])->count('id');
-        $data = ['totalDeal' => $totalDeal, 'totalVisit' => $totalVisit, 'totalFans' => $totalFans, 'totalIncome' => $totalIncome];
-        self::updateByMerchantId($merchantId, $data);
-    }
-
-    public static function updateByMerchantId($merchantId, $data)
-    {
-        xhMerchantAsset::updateByCondition(['merchantId' => $merchantId], $data);
-        return self::refreshByMerchantId($merchantId);
-    }
-
-    public static function refreshByMerchantId($merchantId)
-    {
-        $key = configDict::getCacheKey('merchantAsset') . $merchantId;
-        Yii::$app->redis->executeCommand('DEL', [$key]);
-        return self::getByMerchantId($merchantId);
-    }
-
-    //收入后资产变更 shish 2019.12.24
-    public static function incomeChangeAsset($merchant, $merchantAsset, $updateData, $order, $capitalType)
-    {
-        $merchantId = $merchant['id'];
-        $openMerchant = xhWxOpenService::getMerchant();
-        $openMerchantId = $openMerchant['id'];
-        $orderId = $order['id'];
-        $date = date("Y-m-d H:i");
-        $totalFee = 0;
-        $payWayList = configDict::getConfig('payWayName');
-        $payWay = isset($order['payWay']) ? $order['payWay'] : 0;
-        $payWay = $payWayList[$payWay];
-        $userId = isset($order['userId']) ? $order['userId'] : 0;
-        $user = xhUserService::getById($userId);
-        $userName = isset($user['userName']) ? $user['userName'] : '游客';
-        //充值支付涉及的流水类型列表
-        $typeList = configDict::getConfig('capitalType');
-        //根据流水类型定制通知内容
-        switch ($capitalType) {
-            //购买商品
-            case $typeList['xhOrder']['id']:
-                $totalFee = $order['actPrice'];
-                $goodsList = xhOrderGoodsService::getAllByOrderId($orderId);
-                if (!empty($goodsList)) {
-                    foreach ($goodsList as $goodsKey => $goodsVal) {
-                        $goodsId = $goodsVal['goodsId'];
-                        $goods = xhGoodsService::getById($goodsId);
-                        if (!empty($goods)) {
-                            $actualSold = stringUtil::calcAdd($goods['actualSold'], 1);
-                            xhGoodsService::updateById($goodsId, ['actualSold' => $actualSold]);//商品被售出数量+1
-                        }
-                    }
-                }
-                if ($order['sourceType'] == 0) {
-                    //商城下单后通知
-                    //$data = [];
-                    //InformAdminService::goodsSoldInformAdmin($data);
-                } else {
-                    //门店收入后通知
-                    //$data = [];
-                    //InformAdminService::shopIncomeInformAdmin($data);
-                }
-                break;
-        }
-        self::updateByMerchantId($merchantId, $updateData);
-
-        //数据统计，以下一定要排后面，否则数据不准确
-        xhStatIncomeService::replace($merchantId, $totalFee, $order['payWay']);
-        xhStatIncomeMonthService::replace($merchantId, $totalFee, $order['payWay']);
-        StatIncomeSourceService::replaceData([
-            'merchantId' => $order['merchantId'],
-            'sourceType' => $order['sourceType'],
-            'amount' => $totalFee,
-            'payWay' => $order['payWay']
-        ]);
-    }
-
-    public static function add($data)
-    {
-        $return = xhMerchantAsset::add($data);
-        return $return;
-    }
-
-    public static function withdraw()
-    {
-        $all = xhMerchantService::getAllByCondition(['status' => 1]);
-        if (empty($all)) {
-            return false;
-        }
-        foreach ($all as $merchant) {
-            $connection = Yii::$app->db;//事务处理
-            $transaction = $connection->beginTransaction();
-            try {
-                $merchantId = $merchant['id'];
-                $merchantAsset = self::getByMerchantId($merchantId);
-                $amount = $merchantAsset['balance'];
-                if ($amount <= 0) {
-                    Yii::info('余额不足');
-                    return false;
-                }
-                $mBalance = stringUtil::calcSub($merchantAsset['balance'], $amount);
-                $newFreezeBalance = stringUtil::calcAdd($merchantAsset['freezeBalance'], $amount);
-                $date = date("Y-m-d H:i:s");
-
-                $id = stringUtil::generateMerchantCashOrderNo($merchantId);
-                $cashData = ['id' => $id, 'amount' => $amount, 'merchantId' => $merchantId, 'balance' => $mBalance, 'addTime' => time(), 'createTime' => $date];
-                $order = xhDrawCashService::add($cashData);
-                $orderId = $order['id'];
-                xhMerchantAssetService::updateByMerchantId($merchantId, ['balance' => $mBalance, 'freezeBalance' => $newFreezeBalance]);
-
-                $now = time();
-                $capitalTypeArray = configDict::getConfig('capitalType', 'xhDrawCash');
-                $capitalType = $capitalTypeArray['id'];
-                $mIncome = $merchantAsset['totalIncome'];
-                $mExpend = $merchantAsset['totalExpend'];
-                $payWay = configDict::getConfig('payWay', 'other');
-                $capitalData = [
-                    'relateId' => (string)$orderId,
-                    'balance' => $mBalance,
-                    'totalIncome' => $mIncome,
-                    'totalExpend' => $mExpend,
-                    'amount' => $amount,
-                    'io' => 0,
-                    'payWay' => $payWay,
-                    'event' => '申请提现',
-                    'merchantId' => $merchantId,
-                    'userId' => 0,
-                    'userName' => '',
-                    'alipayId' => '',
-                    'affectBalance' => 1,//会影响商家的余额
-                    'createTime' => $date,
-                    'addTime' => $now,
-                    'capitalType' => $capitalType,
-                    'operateId' => 0,
-                ];
-                xhMerchantCapitalService::add($capitalData);//商家资金流水记录增加
+				}
+				break;
+			default:
+		}
+		self::updateByMerchantId($merchantId, $updateData);
+		
+		//数据统计，以下一定要排后面，否则数据不准确
+		xhStatIncomeService::replace($merchantId, $totalFee, $order['payWay']);
+		xhStatIncomeMonthService::replace($merchantId, $totalFee, $order['payWay']);
+		StatIncomeSourceService::replaceData([
+			'merchantId' => $order['merchantId'],
+			'sourceType' => $order['sourceType'],
+			'amount' => $totalFee,
+			'payWay' => $order['payWay']
+		]);
+	}
+	
+	public static function add($data)
+	{
+		$return = xhMerchantAsset::add($data);
+		return $return;
+	}
+	
+	public static function withdraw()
+	{
+		$all = xhMerchantService::getAllByCondition(['status' => 1]);
+		if (empty($all)) {
+			return false;
+		}
+		foreach ($all as $merchant) {
+			$connection = Yii::$app->db;//事务处理
+			$transaction = $connection->beginTransaction();
+			try {
+				$merchantId = $merchant['id'];
+				$merchantAsset = self::getByMerchantId($merchantId);
+				$amount = $merchantAsset['balance'];
+				if ($amount <= 0) {
+					Yii::info('余额不足');
+					return false;
+				}
+				$mBalance = stringUtil::calcSub($merchantAsset['balance'], $amount);
+				$newFreezeBalance = stringUtil::calcAdd($merchantAsset['freezeBalance'], $amount);
+				$date = date("Y-m-d H:i:s");
+				
+				$id = stringUtil::generateMerchantCashOrderNo($merchantId);
+				$cashData = ['id' => $id, 'amount' => $amount, 'merchantId' => $merchantId, 'balance' => $mBalance, 'addTime' => time(), 'createTime' => $date];
+				$order = xhDrawCashService::add($cashData);
+				$orderId = $order['id'];
+				xhMerchantAssetService::updateByMerchantId($merchantId, ['balance' => $mBalance, 'freezeBalance' => $newFreezeBalance]);
+				
+				$now = time();
+				$capitalTypeArray = configDict::getConfig('capitalType', 'xhDrawCash');
+				$capitalType = $capitalTypeArray['id'];
+				$mIncome = $merchantAsset['totalIncome'];
+				$mExpend = $merchantAsset['totalExpend'];
+				$payWay = configDict::getConfig('payWay', 'other');
+				$capitalData = [
+					'relateId' => (string)$orderId,
+					'balance' => $mBalance,
+					'totalIncome' => $mIncome,
+					'totalExpend' => $mExpend,
+					'amount' => $amount,
+					'io' => 0,
+					'payWay' => $payWay,
+					'event' => '申请提现',
+					'merchantId' => $merchantId,
+					'userId' => 0,
+					'userName' => '',
+					'alipayId' => '',
+					'affectBalance' => 1,//会影响商家的余额
+					'createTime' => $date,
+					'addTime' => $now,
+					'capitalType' => $capitalType,
+					'operateId' => 0,
+				];
+				xhMerchantCapitalService::add($capitalData);//商家资金流水记录增加
 
 //				xhCommonService::sendMobileMsg('15280215347', '有客户申请提现，请及时处理');
-
-                $id = $orderId;
-                $draw = xhDrawCashService::getById($id);
-                $drawAmount = isset($draw['amount']) ? floatval($draw['amount']) : 0;
-                if ($draw['status'] == 1) {
-                    Yii::info('已经完成转账，请不要重复请求!');
-                    return;
-                }
-                $merchantId = isset($draw['merchantId']) ? $draw['merchantId'] : 0;
-                //$admin = xhAdminToMerchantService::getAdminByMerchantId($merchantId);
-                $time = strtotime(date("Y-m-d"));
-                $income = xhStatIncomeService::getByIds($merchantId, $time);
-                $amount = isset($income['amount']) ? $income['amount'] : 0;
-                $merchantExtInfo = xhMerchantExtendService::getByMerchantId($merchantId);//取支付宝帐号
-
-                $asset = xhMerchantAssetService::getByMerchantId($merchantId);
-
-                if ($merchantExtInfo['alipayAccount'] == '') {
-                    Yii::info('转账接收方的支付宝帐号为空');
-                    return;
-                }
-                if ($drawAmount == 0) {
-                    Yii::info('转账金额为0');
-                    return;
-                }
-                $alipayWap = Yii::getAlias("@vendor/alipayWap");
-                require_once($alipayWap . '/aop/AopClient.php');
-                require_once($alipayWap . '/aop/request/AlipayFundTransToaccountTransferRequest.php');
-
-                //require_once($alipayWap . '/config.php');
-                $config = array(
-                    //应用ID,您的APPID。
-                    'app_id' => "2017041906821571",
-
-                    //商户私钥，您的原始格式RSA私钥
-                    'merchant_private_key' => "MIIEpAIBAAKCAQEAvbeu6o90L+0AilI+mbhuJJH0lUv7hWQCEC+XUc+cWlC9ulKC3cSVScVLJHpUc09aj6v/iD1p9iVfgMxjeADNVKiQC2RJyRshAjzyTq+2bTcODp619iV2y4qW8UM65VcP7Ide3P0uT5xC2ReW0HpkdHZgm4F+P7mh1VhGt9qOP3hjvoraAHhtGACvsGvy8H69HhSAG+CEmFt7f2tKNWJ8xEUvkfhDvys93PfTk4xMWj048hJE2r38+2mWI/Il5dFQHWXXTVl2x9yi7uhEEW42a+7s9Q3HgqEvZiQ2NI1FTeEAPLFBApiEsNLY/smaszwqqfWGAyTMvtQ6T4K96GcTLQIDAQABAoIBAHwYTj33n9RJfnT73x7F2KXrIsUVcmyKQh88QgqtdmRNNA1QM3HESLJ8bu5pZhwW5/HaW8dOBKWRRKsHBnlUbPrXV4FcFDeLm0fPfd+iZ/2AaZ1+ix962f3BpYIiq7+f9zaMRazfnw9L8x31pByyMktLs12EkoQ0dHsMxxUzzKAOiiPnvCn8Pv+Jb2qej8GXgCjefutCVNMWGsdwJtMVXEbpdmMa48Wvw+0In5ZS/UG39YAreFzgDqI9jWHE1ZhkGmB1+8hKpeIlEeVGAeYVveUgssMORdA/YY8SWHk26KSIFXBrmdKjAcRJ8Q7ZHUmzIqAV+IMV+RD4J5mZHeJgdAECgYEA8J+Hp1M6eYbT4CPLXa//yRP6Xo+qSzrKHaRB1LRAjYhvKpx/TQetYpNCJ5bWpa+Jp0T5R21pzuYaJkPuGlNEHA13b5T3r1l2ltomSEdaShvD5EZ9WtErYV5zpSv7FjjIGkbwa0H3A8Ydnvw5z4A9TZjjHLjC2GtVGJReqHGglMECgYEAydddA4NRPxmXvIjjmLb1Ft1qwHuyv3vvWhi50foGZXNEnBcfP/OkfyBDDpOEu34GZBMXK9ykHBs1l93OEFGXh7AwW0Lp5lARahBEfBZgPjq5yPO8TOJZrb5hVcuvoDdGjxpRh93XDnQDhWS/1IvUcBLcIsTcnVvfrkX4NLxF/W0CgYEAxamG+gD4rBQBwMImsRN+/2MV7M//iEUG+0qPeXeI/7rv9wUP3etMlwl48qSKNxj37xxN2ksa/Acxu/VZhu6XqKO3VUX+IWFQdaNGh2F13iLozIDLQOtKw3WfcjOq0xpZ5pwXq0RI8iSw+IUhyD8EHNZW2qU8CiRBhyt6hsywqQECgYBa8+06FAachI/XqWfF/UvcDdJ5AkS9/L8SvmmdsSkItjSIkfLHAqdxkbwl6Vu6kUOX/PJIFZjuAWTZFl4xBFNgFYj01uZHnnT6cnIp6HteD2CAqTSFAMqgfFWoL6zoaYAmJBnxO4oZPTYI+ilnQcts5VLFaChx0GCvS2BZgy2W0QKBgQDjP2VtRq4aVSLUq2z1KIDI7GJBbOM5KSW1OEj4sfEdViozPh3Ar/FQWiij1oCZF+iJdKkonHoDbDd+Q0ykcpQ+5Gv07iiT8wJYFR/0j8g2kfql7bVQhGSBeBMS5sawKR3CvkfW73WX+CNnf0PklTY0kTyt6WRXDnKSeyxFVwSZ7g==",
-
-                    //异步通知地址
-                    'notify_url' => Yii::$app->params['frontUrl'] . "/notice/alipay-async",
-
-                    //同步跳转
-                    'return_url' => "",
-
-                    //编码格式
-                    'charset' => "UTF-8",
-
-                    //签名方式
-                    'sign_type' => "RSA2",
-
-                    //支付宝网关
-                    'gatewayUrl' => "https://openapi.alipay.com/gateway.do",
-
-                    //支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
-                    'alipay_public_key' => "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsz3m9juAR1xew4DY6c34gvbwNg8pZ92f932tseKs+4+pF0e+jTDiUo/xHImNDi1KXt1B+s3LxY9L/sxEksbavwmhgbz/igN1cAEwS2YM+Gnf0csDrxAPJhoKL5FTwxPEQ/8VSgroU+6GlF3LAx4VHa1qfn5MqRPfLroJcyPDyGfNe9vna2FnO4E/PH+hVbvPUAwX3XrUvJIm4OgY0JE3HYFlu+O7F4Ln6+Sl+Zv/ZE2nZAvNiyAwW5iVKhKXLieExqwd0NdrP28baBqkkIY+tmV7butGjB52iK1UbU0+1uiaPL4xBxRy6d0LZmYlvdVHp0JRUuwxBLChGgOCo/76DQIDAQAB",
-
-                );
-
-                $aop = new \AopClient();
-                $aop->gatewayUrl = 'https://openapi.alipay.com/gateway.do';
-                $aop->appId = $config['app_id'];
-                $aop->rsaPrivateKey = $config['merchant_private_key'];
-                $aop->alipayrsaPublicKey = $config['alipay_public_key'];
-                $aop->apiVersion = '1.0';
-                $aop->signType = 'RSA2';
-                $aop->postCharset = 'UTF-8';
-                $aop->format = 'json';
-                $request = new \AlipayFundTransToaccountTransferRequest ();
-                $request->setBizContent("{" .
-                    "\"out_biz_no\":\"" . $id . "\"," .
-                    "\"payee_type\":\"ALIPAY_LOGONID\"," .
-                    "\"payee_account\":\"" . $merchantExtInfo['alipayAccount'] . "\"," .
-                    "\"amount\":\"" . $drawAmount . "\"," .
-                    "\"payee_real_name\":\"" . $merchantExtInfo['alipayAccountName'] . "\"," .
-                    "\"payer_show_name\":\"厦门中花汇信息科技有限公司\"," .
-                    "\"remark\":\"提现申请\"" .
-                    "  }");
-                $result = $aop->execute($request);
-                $responseNode = str_replace(".", "_", $request->getApiMethodName()) . "_response";
-                $resultCode = $result->$responseNode->code;
-                $returnOrderId = $result->$responseNode->order_id;
-                if (!empty($resultCode) && $resultCode == 10000) {
-                    xhDrawCashService::updateById($id, ['thirdSerialNumber' => $returnOrderId, 'status' => 1]);
-                    $remainAmount = stringUtil::calcSub($asset['freezeBalance'], $drawAmount);
-                    xhMerchantAssetService::updateByMerchantId($merchantId, ['freezeBalance' => $remainAmount]);
-                    $transaction->commit();
-                    /*
-                    $openId = $admin['openId'];
-                    $openMerchant = xhWxOpenService::getMerchant();//取平台绑定的商家
-                    $openMerchantId = $openMerchant['id'];
-                    $allTM = xhTMessageService::getList($openMerchantId);
-                    $shortTempId = 'OPENTM201319876';
-                    if(isset($allTM[$shortTempId])){
-                    $tempId =  $allTM[$shortTempId];
-                    $data = [
-                        "touser" => $openId,
-                        "template_id" => $tempId,
-                        "url" => Yii::$app->params['adminUrl'] . '/draw-cash/list',
-                        "data" => [
-                            "first" => ["value" => '已经完成结算。', "color" => "#173177"],
-                            "keyword1" => ["value" => '当天', "color" => "#173177"],
-                            "keyword2" => ["value" => $amount . '元', "color" => "#173177"],
-                            "remark" => ["value" => "支付宝收入：{$drawAmount}元，已汇入您的帐户。\n点击查看结算记录", "color" => "#173177"]
-                        ]
-                    ];
-                    }
-                    wxUtil::sendTaskInform($data, $openMerchant);
-                    */
-                    //xhCommonService::sendMobileMsg($admin['mobile'], "您的提现金额：{$drawAmount}元已经到帐，请注意查收。");
-                } else {
-                    $msg = $result->$responseNode->msg;
-                    $sub_code = $result->$responseNode->sub_code;
-                    $sub_msg = $result->$responseNode->sub_msg;
-                    Yii::info("转帐失败，原因：code:" . $resultCode . " msg:" . $msg . " sub_code:" . $sub_code . " sub_msg:" . $sub_msg);
-                    $transaction->rollBack();
-                }
-            } catch (Exception $e) {
-                $transaction->rollBack();
-            }
-        }
-
-    }
+				
+				$id = $orderId;
+				$draw = xhDrawCashService::getById($id);
+				$drawAmount = isset($draw['amount']) ? floatval($draw['amount']) : 0;
+				if ($draw['status'] == 1) {
+					Yii::info('已经完成转账，请不要重复请求!');
+					return;
+				}
+				$merchantId = isset($draw['merchantId']) ? $draw['merchantId'] : 0;
+				//$admin = xhAdminToMerchantService::getAdminByMerchantId($merchantId);
+				$time = strtotime(date("Y-m-d"));
+				$income = xhStatIncomeService::getByIds($merchantId, $time);
+				$amount = isset($income['amount']) ? $income['amount'] : 0;
+				$merchantExtInfo = xhMerchantExtendService::getByMerchantId($merchantId);//取支付宝帐号
+				
+				$asset = xhMerchantAssetService::getByMerchantId($merchantId);
+				
+				if ($merchantExtInfo['alipayAccount'] == '') {
+					Yii::info('转账接收方的支付宝帐号为空');
+					return;
+				}
+				if ($drawAmount == 0) {
+					Yii::info('转账金额为0');
+					return;
+				}
+				$alipayWap = Yii::getAlias("@vendor/alipayWap");
+				require_once($alipayWap . '/aop/AopClient.php');
+				require_once($alipayWap . '/aop/request/AlipayFundTransToaccountTransferRequest.php');
+				
+				//require_once($alipayWap . '/config.php');
+				$config = array(
+					//应用ID,您的APPID。
+					'app_id' => "2017041906821571",
+					
+					//商户私钥，您的原始格式RSA私钥
+					'merchant_private_key' => "MIIEpAIBAAKCAQEAvbeu6o90L+0AilI+mbhuJJH0lUv7hWQCEC+XUc+cWlC9ulKC3cSVScVLJHpUc09aj6v/iD1p9iVfgMxjeADNVKiQC2RJyRshAjzyTq+2bTcODp619iV2y4qW8UM65VcP7Ide3P0uT5xC2ReW0HpkdHZgm4F+P7mh1VhGt9qOP3hjvoraAHhtGACvsGvy8H69HhSAG+CEmFt7f2tKNWJ8xEUvkfhDvys93PfTk4xMWj048hJE2r38+2mWI/Il5dFQHWXXTVl2x9yi7uhEEW42a+7s9Q3HgqEvZiQ2NI1FTeEAPLFBApiEsNLY/smaszwqqfWGAyTMvtQ6T4K96GcTLQIDAQABAoIBAHwYTj33n9RJfnT73x7F2KXrIsUVcmyKQh88QgqtdmRNNA1QM3HESLJ8bu5pZhwW5/HaW8dOBKWRRKsHBnlUbPrXV4FcFDeLm0fPfd+iZ/2AaZ1+ix962f3BpYIiq7+f9zaMRazfnw9L8x31pByyMktLs12EkoQ0dHsMxxUzzKAOiiPnvCn8Pv+Jb2qej8GXgCjefutCVNMWGsdwJtMVXEbpdmMa48Wvw+0In5ZS/UG39YAreFzgDqI9jWHE1ZhkGmB1+8hKpeIlEeVGAeYVveUgssMORdA/YY8SWHk26KSIFXBrmdKjAcRJ8Q7ZHUmzIqAV+IMV+RD4J5mZHeJgdAECgYEA8J+Hp1M6eYbT4CPLXa//yRP6Xo+qSzrKHaRB1LRAjYhvKpx/TQetYpNCJ5bWpa+Jp0T5R21pzuYaJkPuGlNEHA13b5T3r1l2ltomSEdaShvD5EZ9WtErYV5zpSv7FjjIGkbwa0H3A8Ydnvw5z4A9TZjjHLjC2GtVGJReqHGglMECgYEAydddA4NRPxmXvIjjmLb1Ft1qwHuyv3vvWhi50foGZXNEnBcfP/OkfyBDDpOEu34GZBMXK9ykHBs1l93OEFGXh7AwW0Lp5lARahBEfBZgPjq5yPO8TOJZrb5hVcuvoDdGjxpRh93XDnQDhWS/1IvUcBLcIsTcnVvfrkX4NLxF/W0CgYEAxamG+gD4rBQBwMImsRN+/2MV7M//iEUG+0qPeXeI/7rv9wUP3etMlwl48qSKNxj37xxN2ksa/Acxu/VZhu6XqKO3VUX+IWFQdaNGh2F13iLozIDLQOtKw3WfcjOq0xpZ5pwXq0RI8iSw+IUhyD8EHNZW2qU8CiRBhyt6hsywqQECgYBa8+06FAachI/XqWfF/UvcDdJ5AkS9/L8SvmmdsSkItjSIkfLHAqdxkbwl6Vu6kUOX/PJIFZjuAWTZFl4xBFNgFYj01uZHnnT6cnIp6HteD2CAqTSFAMqgfFWoL6zoaYAmJBnxO4oZPTYI+ilnQcts5VLFaChx0GCvS2BZgy2W0QKBgQDjP2VtRq4aVSLUq2z1KIDI7GJBbOM5KSW1OEj4sfEdViozPh3Ar/FQWiij1oCZF+iJdKkonHoDbDd+Q0ykcpQ+5Gv07iiT8wJYFR/0j8g2kfql7bVQhGSBeBMS5sawKR3CvkfW73WX+CNnf0PklTY0kTyt6WRXDnKSeyxFVwSZ7g==",
+					
+					//异步通知地址
+					'notify_url' => Yii::$app->params['frontUrl'] . "/notice/alipay-async",
+					
+					//同步跳转
+					'return_url' => "",
+					
+					//编码格式
+					'charset' => "UTF-8",
+					
+					//签名方式
+					'sign_type' => "RSA2",
+					
+					//支付宝网关
+					'gatewayUrl' => "https://openapi.alipay.com/gateway.do",
+					
+					//支付宝公钥,查看地址：https://openhome.alipay.com/platform/keyManage.htm 对应APPID下的支付宝公钥。
+					'alipay_public_key' => "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsz3m9juAR1xew4DY6c34gvbwNg8pZ92f932tseKs+4+pF0e+jTDiUo/xHImNDi1KXt1B+s3LxY9L/sxEksbavwmhgbz/igN1cAEwS2YM+Gnf0csDrxAPJhoKL5FTwxPEQ/8VSgroU+6GlF3LAx4VHa1qfn5MqRPfLroJcyPDyGfNe9vna2FnO4E/PH+hVbvPUAwX3XrUvJIm4OgY0JE3HYFlu+O7F4Ln6+Sl+Zv/ZE2nZAvNiyAwW5iVKhKXLieExqwd0NdrP28baBqkkIY+tmV7butGjB52iK1UbU0+1uiaPL4xBxRy6d0LZmYlvdVHp0JRUuwxBLChGgOCo/76DQIDAQAB",
+				
+				);
+				
+				$aop = new \AopClient();
+				$aop->gatewayUrl = 'https://openapi.alipay.com/gateway.do';
+				$aop->appId = $config['app_id'];
+				$aop->rsaPrivateKey = $config['merchant_private_key'];
+				$aop->alipayrsaPublicKey = $config['alipay_public_key'];
+				$aop->apiVersion = '1.0';
+				$aop->signType = 'RSA2';
+				$aop->postCharset = 'UTF-8';
+				$aop->format = 'json';
+				$request = new \AlipayFundTransToaccountTransferRequest ();
+				$request->setBizContent("{" .
+					"\"out_biz_no\":\"" . $id . "\"," .
+					"\"payee_type\":\"ALIPAY_LOGONID\"," .
+					"\"payee_account\":\"" . $merchantExtInfo['alipayAccount'] . "\"," .
+					"\"amount\":\"" . $drawAmount . "\"," .
+					"\"payee_real_name\":\"" . $merchantExtInfo['alipayAccountName'] . "\"," .
+					"\"payer_show_name\":\"厦门中花汇信息科技有限公司\"," .
+					"\"remark\":\"提现申请\"" .
+					"  }");
+				$result = $aop->execute($request);
+				$responseNode = str_replace(".", "_", $request->getApiMethodName()) . "_response";
+				$resultCode = $result->$responseNode->code;
+				$returnOrderId = $result->$responseNode->order_id;
+				if (!empty($resultCode) && $resultCode == 10000) {
+					xhDrawCashService::updateById($id, ['thirdSerialNumber' => $returnOrderId, 'status' => 1]);
+					$remainAmount = stringUtil::calcSub($asset['freezeBalance'], $drawAmount);
+					xhMerchantAssetService::updateByMerchantId($merchantId, ['freezeBalance' => $remainAmount]);
+					$transaction->commit();
+					/*
+					$openId = $admin['openId'];
+					$openMerchant = xhWxOpenService::getMerchant();//取平台绑定的商家
+					$openMerchantId = $openMerchant['id'];
+					$allTM = xhTMessageService::getList($openMerchantId);
+					$shortTempId = 'OPENTM201319876';
+					if(isset($allTM[$shortTempId])){
+					$tempId =  $allTM[$shortTempId];
+					$data = [
+						"touser" => $openId,
+						"template_id" => $tempId,
+						"url" => Yii::$app->params['adminUrl'] . '/draw-cash/list',
+						"data" => [
+							"first" => ["value" => '已经完成结算。', "color" => "#173177"],
+							"keyword1" => ["value" => '当天', "color" => "#173177"],
+							"keyword2" => ["value" => $amount . '元', "color" => "#173177"],
+							"remark" => ["value" => "支付宝收入：{$drawAmount}元，已汇入您的帐户。\n点击查看结算记录", "color" => "#173177"]
+						]
+					];
+					}
+					wxUtil::sendTaskInform($data, $openMerchant);
+					*/
+					//xhCommonService::sendMobileMsg($admin['mobile'], "您的提现金额：{$drawAmount}元已经到帐，请注意查收。");
+				} else {
+					$msg = $result->$responseNode->msg;
+					$sub_code = $result->$responseNode->sub_code;
+					$sub_msg = $result->$responseNode->sub_msg;
+					Yii::info("转帐失败，原因：code:" . $resultCode . " msg:" . $msg . " sub_code:" . $sub_code . " sub_msg:" . $sub_msg);
+					$transaction->rollBack();
+				}
+			} catch (Exception $e) {
+				$transaction->rollBack();
+			}
+		}
+		
+	}
 }

console/controllers/UpgradeController.php

@@ -26,22 +26,22 @@ use yii\console\Controller;
 
 class UpgradeController extends Controller
 {
-
-    //正式环境 shish
-    //yii upgrade/init 2
-    public function actionInit($num = 0)
-    {
-        if (getenv('YII_ENV') == 'dev') {
-            util::stop('开发环境不允许再初始化');
-        }
-
-        //更新积分 shish 2019.11.22
-        $sql = "ALTER TABLE xhUserAsset ADD growth INT NOT NULL DEFAULT 0 COMMENT '成长值' AFTER `point`;";
-        $sql .= "UPDATE `xhUserAsset` SET `growth`=`integral`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //shish 2019.11.23
-        $sql = "DROP TABLE IF EXISTS xhAuth;
+	
+	//正式环境 shish
+	//yii upgrade/init 2
+	public function actionInit($num = 0)
+	{
+		if (getenv('YII_ENV') == 'dev') {
+			util::stop('开发环境不允许再初始化');
+		}
+		
+		//更新积分 shish 2019.11.22
+		$sql = "ALTER TABLE xhUserAsset ADD growth INT NOT NULL DEFAULT 0 COMMENT '成长值' AFTER `point`;";
+		$sql .= "UPDATE `xhUserAsset` SET `growth`=`integral`;";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//shish 2019.11.23
+		$sql = "DROP TABLE IF EXISTS xhAuth;
 CREATE TABLE xhAuth(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 endId TINYINT NOT NULL DEFAULT 0 COMMENT '业务端，零售1',
@@ -65,20 +65,20 @@ roleId INT NOT NULL DEFAULT 0 COMMENT '角色id',
 auth VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '权限',
 `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间'
 )COMMENT='员工角色权限';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE xhAdminRoleAuth ADD endId TINYINT NOT NULL DEFAULT 0 COMMENT '业务端id' AFTER roleId;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE xhAdminRoleAuth ADD endId TINYINT NOT NULL DEFAULT 0 COMMENT '业务端id' AFTER roleId;
 ALTER TABLE xhMerchant ADD setId TINYINT NOT NULL DEFAULT 0 COMMENT '套餐id' AFTER `wxRefreshToken`;
 ALTER TABLE xhMerchant ADD setDeadline INT NOT NULL DEFAULT 0 COMMENT '套餐到期时间' AFTER `setId`;
 ALTER TABLE xhAuth CHANGE front_url frontUrl VARCHAR(30) NOT NULL DEFAULT '' COMMENT '前端路由';
 ALTER TABLE xhAuth CHANGE back_url backUrl VARCHAR(30) NOT NULL DEFAULT '' COMMENT '后端路由';
 ALTER TABLE xhAdminRole CHANGE authority auth VARCHAR(500) NOT NULL DEFAULT '' COMMENT '权限id列表，存在*表示有所有权限';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //!!!!!!!!!!注意第一家全部订单已经完成，并将全部订单置为已完成
-        $sql = "ALTER TABLE xhOrder MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '订单状态 0待付款 1待配送 2配送中 3待通知 4已取消 5已完成';";
-        $sql .= "update xhOrder set `status`=5;";
-        $sql .= "DROP TABLE IF EXISTS xhCategoryRelate;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//!!!!!!!!!!注意第一家全部订单已经完成，并将全部订单置为已完成
+		$sql = "ALTER TABLE xhOrder MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '订单状态 0待付款 1待配送 2配送中 3待通知 4已取消 5已完成';";
+		$sql .= "update xhOrder set `status`=5;";
+		$sql .= "DROP TABLE IF EXISTS xhCategoryRelate;
 ALTER TABLE xhCategory ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER parentId;
 DROP TABLE IF EXISTS xhGoodsUsage;
 DROP TABLE IF EXISTS xhUsage;
@@ -169,9 +169,9 @@ ALTER TABLE xhCoupon DROP COLUMN `targetId`;
 ALTER TABLE xhCoupon MODIFY deadline INT NOT NULL DEFAULT 0 COMMENT '过期时间；值4102416000表示永不过期，即2100-01-01 00:00:00';
 ALTER TABLE xhCoupon ADD INDEX userId(userId,`status`);
 ALTER TABLE xhCoupon ADD INDEX merchantId(merchantId,`status`);";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE xhGoods CHANGE `style` `goodsStyle` TINYINT NOT NULL DEFAULT 0 COMMENT '商品款式 0单款式 1多款式';
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE xhGoods CHANGE `style` `goodsStyle` TINYINT NOT NULL DEFAULT 0 COMMENT '商品款式 0单款式 1多款式';
 ALTER TABLE xhGoodsStyle CHANGE `order` `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序';
 ALTER TABLE xhGoodsStyle DROP COLUMN `softDel`;
 UPDATE xhUserAsset SET `discount`=1;
@@ -241,10 +241,10 @@ ALTER TABLE xhGoodsCategory ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '上
 ALTER TABLE xhCategory ADD goodsNum INT NOT NULL DEFAULT 0 COMMENT '商品数' AFTER `cover`;
 ALTER TABLE xhCategory ADD sold INT NOT NULL DEFAULT 0 COMMENT '销量' AFTER `goodsNum`;
 ALTER TABLE xhCategory CHANGE cover `img` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '分类图片';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //商品设置 员工 角色
-        $sql = "ALTER TABLE xhGoodsSetting DROP COLUMN `startRiseTime`;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//商品设置 员工 角色
+		$sql = "ALTER TABLE xhGoodsSetting DROP COLUMN `startRiseTime`;
 ALTER TABLE xhGoodsSetting DROP COLUMN `endRiseTime`;
 ALTER TABLE xhGoodsSetting CHANGE `goodSIntroduce` `goodsIntroduce` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '商品说明';
 ALTER TABLE xhGoodsSetting DROP COLUMN `createTime`;
@@ -286,9 +286,9 @@ id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 adminId INT NOT NULL DEFAULT 0 COMMENT '员工id；管理员id',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 )COMMENT='员工操作日志';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE xhCoupon MODIFY getType TINYINT NOT NULL DEFAULT 0 COMMENT '获取方式，0新人领券 1邀请领券';
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE xhCoupon MODIFY getType TINYINT NOT NULL DEFAULT 0 COMMENT '获取方式，0新人领券 1邀请领券';
 DROP TABLE IF EXISTS `xhCouponAsset`;
 CREATE TABLE IF NOT EXISTS `xhCouponAsset`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -337,9 +337,9 @@ ALTER TABLE xhOrder ADD `gradeService` TINYINT NOT NULL DEFAULT 0 COMMENT '服
 ALTER TABLE xhOrder ADD `gradeQuality` TINYINT NOT NULL DEFAULT 0 COMMENT '鲜花品质评分' AFTER `gradeService`;
 ALTER TABLE xhOrder ADD `gradeSend` TINYINT NOT NULL DEFAULT 0 COMMENT '配送服务评分' AFTER `gradeQuality`;
 ALTER TABLE xhOrder ADD `evaluate` VARCHAR(800) NOT NULL DEFAULT '' COMMENT '评语' AFTER `gradeSend`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "update xhMerchantExtend set gradeList='1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8';
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "update xhMerchantExtend set gradeList='1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8';
 DROP TABLE IF EXISTS `xhAgentLevel`;
 CREATE TABLE IF NOT EXISTS xhAgentLevel(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -393,9 +393,9 @@ ALTER TABLE xhOrderSend ADD inTurn INT NOT NULL DEFAULT 0 COMMENT '排序' AFTER
 ALTER TABLE xhOrderSend MODIFY `orderId` CHAR(32) NOT NULL DEFAULT '' COMMENT '订单号';
 ALTER TABLE xhOrderGoods MODIFY `orderId` CHAR(32) NOT NULL DEFAULT '' COMMENT '订单号';
 ALTER TABLE xhOrder MODIFY `id` CHAR(32) NOT NULL DEFAULT '' COMMENT '订单号';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE xhOrder ADD totalFlow TINYINT NOT NULL DEFAULT 5 COMMENT '总流程数' AFTER `evaluate`;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE xhOrder ADD totalFlow TINYINT NOT NULL DEFAULT 5 COMMENT '总流程数' AFTER `evaluate`;
 ALTER TABLE xhOrder ADD currentFlow TINYINT NOT NULL DEFAULT 0 COMMENT '当前流程数' AFTER `totalFlow`;
 UPDATE xhOrder SET totalFlow=5,currentFlow=5;
 ALTER TABLE `xhOrder` DROP PRIMARY KEY;
@@ -425,9 +425,9 @@ ALTER TABLE xhOrder MODIFY `receiveFloor` VARCHAR(50) NOT NULL DEFAULT '' COMMEN
 ALTER TABLE xhOrder MODIFY `sendType` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方式 0免配送 1自己送 2别人送，快递送';
 ALTER TABLE xhOrder ADD `sendSide` TINYINT NOT NULL DEFAULT 0 COMMENT '配送方 0没有 1达达' AFTER `sendType`;
 ALTER TABLE xhOrder MODIFY `sendStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '配送状态：0未发货，待接单 1已发货，已接单 2已送达' AFTER `sendSide`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE xhOrder ADD `reachDate` DATE DEFAULT NULL COMMENT '客户要求送到的日期' AFTER `sendDistance`;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE xhOrder ADD `reachDate` DATE DEFAULT NULL COMMENT '客户要求送到的日期' AFTER `sendDistance`;
 ALTER TABLE xhOrder DROP COLUMN `reachTime`;
 ALTER TABLE xhOrder MODIFY `reachPeriod` TINYINT NOT NULL DEFAULT 0 COMMENT '客户要求送到的时段：0上午1下午2晚上';
 ALTER TABLE xhOrder ADD sendTip DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '运费里增加的小费' AFTER `sendCost`;
@@ -467,9 +467,9 @@ ALTER TABLE `xhOrder` ADD `classify` TINYINT NOT NULL DEFAULT 0 COMMENT '是否
 ALTER TABLE xhUsage ADD `inTurn` INT NOT NULL DEFAULT 0 COMMENT '排序' AFTER `usageName`;
 ALTER TABLE `xhInvite` ADD amount DECIMAL(9,2) NOT NULL DEFAULT 0.00 COMMENT '下单金额' AFTER `couponId`;
 ALTER TABLE `xhInvite` ADD giveTime INT NOT NULL DEFAULT 0 COMMENT '兑奖时间' AFTER `orderTime`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "DROP TABLE IF EXISTS `xhCouponAsset`;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "DROP TABLE IF EXISTS `xhCouponAsset`;
 CREATE TABLE IF NOT EXISTS `xhCouponAsset`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
@@ -519,9 +519,9 @@ RENAME TABLE `xhDrawCash` TO `xhWithdraw`;
 RENAME TABLE `xhActive` TO `xhAct`;
 RENAME TABLE `xhActiveOrder` TO `xhActOrder`;
 RENAME TABLE `xhActiveTicketClass` TO `xhActTicket`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT '订单数；已付款订单数';
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT '订单数；已付款订单数';
 ALTER TABLE `xhMerchantAsset` ADD cancelOrder INT NOT NULL DEFAULT 0 COMMENT '已取消订单数' AFTER `totalOrder`;
 ALTER TABLE `xhMerchantAsset` ADD unNoticeOrder INT NOT NULL DEFAULT 0 COMMENT '待通知订单数' AFTER `totalOrder`;
 ALTER TABLE `xhMerchantAsset` ADD sendingOrder INT NOT NULL DEFAULT 0 COMMENT '配送中订单数' AFTER `totalOrder`;
@@ -535,9 +535,9 @@ ALTER TABLE `xhMerchantAsset` MODIFY `totalOrder` INT NOT NULL DEFAULT 0 COMMENT
 ALTER TABLE `xhMerchantAsset` ADD `payOrder` INT NOT NULL DEFAULT 0 COMMENT '付款订单数' AFTER `totalOrder`;
 ALTER TABLE `xhMerchant` ADD `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间' AFTER `status`;
 ALTER TABLE `xhAdmin` ADD `avatar` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '头像' AFTER `adminName`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE `xhMerchant` MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '商家状态 0待审 1审核通过，取消冻结，正常 2审核未通过 3冻结 4过期';
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE `xhMerchant` MODIFY `status` TINYINT NOT NULL DEFAULT 0 COMMENT '商家状态 0待审 1审核通过，取消冻结，正常 2审核未通过 3冻结 4过期';
 ALTER TABLE `xhMerchantExtend` ADD miniVersion INT NOT NULL DEFAULT 0 COMMENT '小程序当前版本' AFTER `miniRefreshToken`;
 DROP TABLE IF EXISTS `xhMiniUpgrade`;
 CREATE TABLE `xhMiniUpgrade`(
@@ -590,9 +590,9 @@ CREATE TABLE IF NOT EXISTS `xhRetailAsset` (
   `totalExpend` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '累计消费',
   `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 ) COMMENT='平台零售业资产';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE `xhRetailAsset` ADD onGoods INT NOT NULL DEFAULT 0 COMMENT '上架商品数' AFTER `totalGoods`;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE `xhRetailAsset` ADD onGoods INT NOT NULL DEFAULT 0 COMMENT '上架商品数' AFTER `totalGoods`;
 ALTER TABLE `xhRetailAsset` ADD offGoods INT NOT NULL DEFAULT 0 COMMENT '下架商品数' AFTER `totalGoods`;
 ALTER TABLE `xhMerchantAsset` ADD onGoods INT NOT NULL DEFAULT 0 COMMENT '上架商品数' AFTER `totalGoods`;
 ALTER TABLE `xhMerchantAsset` ADD offGoods INT NOT NULL DEFAULT 0 COMMENT '下架商品数' AFTER `totalGoods`;
@@ -614,9 +614,9 @@ CREATE TABLE `xhFestRise` (
 ) COMMENT='涨价节日';
 ALTER TABLE `xhSetMeal` ADD num INT NOT NULL DEFAULT 0 COMMENT '花店数量' AFTER `price`;
 ALTER TABLE `xhSetMeal` DROP COLUMN `manageStyle`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE `xhApply` ADD UNIQUE INDEX `mobile`(`mobile`);
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE `xhApply` ADD UNIQUE INDEX `mobile`(`mobile`);
 ALTER TABLE `xhRenew` ADD `orderSn` CHAR(30) NOT NULL DEFAULT '' COMMENT '订单编号' AFTER `id`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `roleId`;
 ALTER TABLE `xhWxOpenAdmin` DROP COLUMN `province`;
@@ -662,9 +662,9 @@ ALTER TABLE `xhCouponAsset` ADD `unUseNum` INT NOT NULL DEFAULT 0 COMMENT '待
 ALTER TABLE `xhCouponAsset` ADD `useNum` INT NOT NULL DEFAULT 0 COMMENT '已使用数' AFTER `unUseNum`;
 ALTER TABLE `xhCouponAsset` ADD `invalidNum` INT NOT NULL DEFAULT 0 COMMENT '已失效数' AFTER `useNum`;
 ALTER TABLE `xhOrder` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '订单来源，0商城 1门店 2微信朋友圈 3美团';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE `xhAdmin` ADD platUserId INT NOT NULL DEFAULT 0 COMMENT '管理员对应的花卉宝id' AFTER `userId`;
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE `xhAdmin` ADD platUserId INT NOT NULL DEFAULT 0 COMMENT '管理员对应的花卉宝id' AFTER `userId`;
 ALTER TABLE `xhAdmin` ADD openId VARCHAR(100) NOT NULL DEFAULT '' COMMENT '管理员对应商家公众号openId' AFTER `userId`;
 ALTER TABLE `xhAdmin` DROP COLUMN `openId`;
 ALTER TABLE `xhAdmin` ADD `delStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '软删除标识 0未删除 1已删除' AFTER `super`;
@@ -687,9 +687,9 @@ ALTER TABLE `xhRecharge` AUTO_INCREMENT=135736;
 UPDATE `xhRecharge` SET id=id+135736;
 ALTER TABLE `xhRecharge` DROP COLUMN `createTime`;
 ALTER TABLE `xhRecharge` DROP COLUMN `updateTime`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE `xhUserAsset` MODIFY `memberLevel` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE `xhUserAsset` MODIFY `memberLevel` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
 ALTER TABLE `xhUserAsset` CHANGE `memberLevel` `member` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
 ALTER TABLE `xhUserAsset` DROP COLUMN `isMember`;
 ALTER TABLE `xhUser` DROP COLUMN `isMember`;
@@ -724,298 +724,328 @@ ALTER TABLE `xhMerchantCapital` MODIFY `capitalType` TINYINT NOT NULL DEFAULT 0
 ALTER TABLE `xhMerchantCapital` MODIFY `payWay` TINYINT NOT NULL DEFAULT 0 COMMENT '付款方式；支付方式';
 ALTER TABLE `xhMerchantCapital` MODIFY `sourceType` TINYINT NOT NULL DEFAULT 0 COMMENT '来源';
 ALTER TABLE `xhMerchantCapital` MODIFY `io` TINYINT NOT NULL DEFAULT 0 COMMENT '收支类型 0支出 1收入';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        $sql = "ALTER TABLE `xhMerchant` ADD `deadline` INT NOT NULL DEFAULT 0 COMMENT '帐号过期时间' AFTER `status`;UPDATE `xhMerchant` SET `deadline`=1607589778;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-
-        //导入省市区
-        $root = dirUtil::getRootDir();
-        $sql = file_get_contents($root . '/region.sql');
-        Yii::$app->db->createCommand($sql)->execute();
-
-
-        //将订单商品表的订单id换成自增id
-        $orderGoods = OrderGoodsService::getAllByCondition([], null, '*');
-        if (!empty($orderGoods)) {
-            $ids = array_column($orderGoods, 'orderId');
-            $orderList = OrderService::getAllByCondition(['orderSn' => ['in', $ids]], null, '*', 'orderSn');
-            foreach ($orderList as $orderSn => $val) {
-                $id = $val['id'];
-                OrderGoodsService::updateByCondition(['orderId' => $orderSn], ['orderId' => $id]);
-            }
-        }
-        $sql = "alter table `xhOrderGoods` modify orderId int not null default 0 comment '订单id';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //商品多款式同步
-        $goodsList = GoodsService::getAllByCondition([], null, '*');
-        if (!empty($goodsList)) {
-            foreach ($goodsList as $goods) {
-                $multiPrice = $goods['multiPrice'];
-                if (!empty($multiPrice)) {
-                    $currentIds = explode(',', trim($multiPrice));
-                    if (!empty($currentIds)) {
-                        $currentIds = array_filter(array_unique($currentIds));
-                        $goodsId = $goods['id'];
-                        foreach ($currentIds as $currentId) {
-                            GoodsStyleService::updateByCondition(['id' => $currentId], ['goodsId' => $goodsId]);
-                        }
-                    }
-                }
-            }
-        }
-        $sql = "ALTER TABLE xhGoods DROP COLUMN `multiPrice`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //商家流水
-        $mCapital = MerchantCapitalService::getAllByCondition([], null, '*');
-        if (!empty($mCapital)) {
-            foreach ($mCapital as $capital) {
-                $relateId = $capital['relateId'];
-                $id = $capital['id'];
-                if (!empty($relateId)) {
-                    $order = OrderService::getByCondition(['orderSn' => $relateId]);
-                    if (!empty($order)) {
-                        $orderId = $order['id'];
-                        MerchantCapitalService::updateById($id, ['relateId' => $orderId]);
-                    } else {
-                        MerchantCapitalService::updateById($id, ['relateId' => 0]);
-                    }
-                } else {
-                    MerchantCapitalService::updateById($id, ['relateId' => 0]);
-                }
-            }
-        }
-        $sql = "ALTER TABLE `xhMerchantCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //客户流水
-        $uCapital = UserCapitalService::getAllByCondition([], null, '*');
-        if (!empty($uCapital)) {
-            foreach ($uCapital as $capital) {
-                $relateId = $capital['relateId'];
-                $id = $capital['id'];
-                if (!empty($relateId)) {
-                    $order = OrderService::getByCondition(['orderSn' => $relateId]);
-                    if (!empty($order)) {
-                        $orderId = $order['id'];
-                        UserCapitalService::updateById($id, ['relateId' => $orderId]);
-                    } else {
-                        UserCapitalService::updateById($id, ['relateId' => 0]);
-                    }
-                } else {
-                    UserCapitalService::updateById($id, ['relateId' => 0]);
-                }
-            }
-        }
-        $sql = "ALTER TABLE `xhUserCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //客户成长值
-        $userGrowth = UserGrowthService::getAllByCondition([], null, '*');
-        if (!empty($userGrowth)) {
-            foreach ($userGrowth as $relateId => $growth) {
-                $relateId = $growth['relateId'];
-                $id = $growth['id'];
-                if (!empty($relateId)) {
-                    $order = OrderService::getByCondition(['orderSn' => $relateId]);
-                    if (!empty($order)) {
-                        $orderId = $order['id'];
-                        UserGrowthService::updateById($id, ['relateId' => $orderId]);
-                    } else {
-                        UserGrowthService::updateById($id, ['relateId' => 0]);
-                    }
-                } else {
-                    UserGrowthService::updateById($id, ['relateId' => 0]);
-                }
-            }
-        }
-        $sql = "ALTER TABLE `xhUserGrowth` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id';ALTER TABLE `xhAdminRoleAuth` ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `endId`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-
-        //统计相关
-        //xhStatIncomeMonth
-        $list = StatIncomeMonthService::getAllByCondition([], null, '*');
-        if (!empty($list)) {
-            foreach ($list as $val) {
-                $year = $val['year'];
-                $month = $val['month'];
-                $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
-                $id = $val['id'];
-                StatIncomeMonthService::updateById($id, ['time' => $date]);
-            }
-        }
-        //xhStatIncomeSourceMonth
-        $list = StatIncomeSourceMonthService::getAllByCondition([], null, '*');
-        if (!empty($list)) {
-            foreach ($list as $val) {
-                $year = $val['year'];
-                $month = $val['month'];
-                $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
-                $id = $val['id'];
-                StatIncomeSourceMonthService::updateById($id, ['time' => $date]);
-            }
-        }
-        //xhStatOrder
-        $list = StatOrderService::getAllByCondition([], null, '*');
-        if (!empty($list)) {
-            foreach ($list as $val) {
-                $id = $val['id'];
-                $date = date("Ymd", $val['time']);
-                StatOrderService::updateById($id, ['time' => $date]);
-            }
-        }
-        //xhStatOrderMonth
-        $list = StatOrderMonthService::getAllByCondition([], null, '*');
-        if (!empty($list)) {
-            foreach ($list as $val) {
-                $year = $val['year'];
-                $month = $val['month'];
-                $date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
-                $id = $val['id'];
-                StatOrderMonthService::updateById($id, ['time' => $date]);
-            }
-        }
-
-        if ($num == 2) {
-            $this->actionInit2();
-        }
-
-        if ($num == 3) {
-            $this->actionInit2();
-            $this->actionSyncAvatar();
-        }
-
-    }
-
-    public function actionInit2()
-    {
-        //更新管理员
-        $sql = 'update `xhAdmin` set password="' . password_hash('123456', PASSWORD_BCRYPT) . '",confirmPassword="' . password_hash('123456', PASSWORD_BCRYPT) . '";update `xhAdmin` set merchantId=12358,platUserId=12543212 where id=1;update `xhAdmin` set merchantId=12359,platUserId=12540901 where id=3;update `xhAdmin` set merchantId=12360 where id=4;update `xhAdmin` set merchantId=12361,platUserId=12540861 where id=5;update `xhStaff` set `password`="' . password_hash('123456', PASSWORD_BCRYPT) . '"';
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //生产环境国兰密码要更新进去
-        if (getenv('YII_ENV') == 'production') {
-            $password = password_hash('glhs610000', PASSWORD_BCRYPT);
-            $confirmPassword = password_hash('454588', PASSWORD_BCRYPT);
-            $sql = "update `xhAdmin` set password='{$password}',confirmPassowrd='{$confirmPassword}' where id=1";
-            Yii::$app->db->createCommand($sql)->execute();
-        }
-
-        //国兰老客户导入
-        $oldUserList = Yii::$app->db2->createCommand('select * from xhUserOldData where `status`=0')->queryAll();
-        if (!empty($oldUserList)) {
-            foreach ($oldUserList as $user) {
-                $mobile = $user['mobile'];
-                $exists = UserService::getByCondition(['mobile' => $mobile, 'merchantId' => 12358]);
-                if (!empty($exists)) {
-                    echo "老客户：'.$mobile.'已经导入过了。\n";
-                    continue;
-                }
-                $user['realName'] = $user['userName'];
-                $user['growth'] = $user['integral'];
-                $insertUser = UserService::addUser($user);
-                $id = $user['id'];
-                Yii::$app->db2->createCommand("update xhUserOldData set `status`=1 where id={$id}")->execute();
-                echo "老客户导入生成userId:" . $insertUser['id'] . "\n";
-            }
-        }
-
-        //更新国兰的菜单分类
-        $sql = "truncate `xhCategory`;insert  into `xhCategory`(`id`,`parentId`,`merchantId`,`categoryName`,`description`,`img`,`goodsNum`,`sold`,`inTurn`,`status`) values (1,0,12358,'花束','唯美花束','',0,0,15,1),(2,0,12358,'花盒','时尚花盒','',0,0,14,1),(3,0,12358,'开业花篮','开业花篮','',0,0,0,1),(4,0,12358,'婚礼用花','婚礼用花','',0,0,0,1),(5,0,12358,'会议用花','会议用花','',0,0,0,1),(9,0,12358,'蝴蝶兰专区','蝴蝶兰','',0,0,4,1),(87,0,12358,'花篮','时尚礼篮','',0,0,4,1),(88,0,12358,'植物-微景观','植物-微景观','',0,0,4,1);";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //更新菜单与商品对应关系
-        Yii::$app->db->createCommand("truncate `xhGoodsCategory`;")->execute();
-        $goodsCategory = Yii::$app->db2->createCommand('select * from `xhGoodsCategory` where `merchantId`=12358')->queryAll();
-        if (!empty($goodsCategory)) {
-            foreach ($goodsCategory as $val) {
-                $cId = $val['cId'];
-                $gId = $val['gId'];
-                $inTurn = $val['inTurn'];
-                $merchantId = $val['merchantId'];
-                GoodsCategoryService::add(['gId' => $gId, 'cId' => $cId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
-                echo $cId . ' ' . $gId . "\n";
-
-            }
-        }
-        $goodsUsage = Yii::$app->db2->createCommand('select * from `xhGoodsUsage` where `merchantId`=12358')->queryAll();
-        if (!empty($goodsUsage)) {
-            foreach ($goodsUsage as $val) {
-                $usageId = $val['usageId'];
-                $goodsId = $val['goodsId'];
-                $inTurn = $val['inTurn'];
-                $merchantId = $val['merchantId'];
-                GoodsCategoryService::add(['gId' => $goodsId, 'cId' => $usageId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
-                echo $usageId . ' ' . $goodsId . "\n";
-            }
-        }
-
-        //会员打折和会员等级要同步，要先导老客户 shish 2020.1.12
-        $merchantList = MerchantExtendService::getAllByCondition([], null, '*', 'merchantId');
-        $userAssetList = UserAssetService::getAllByCondition([], null, '*');
-        if (!empty($userAssetList)) {
-            foreach ($userAssetList as $asset) {
-                $id = $asset['userId'];
-                $merchantId = $asset['merchantId'];
-                $growth = $asset['growth'];
-                $currentMember = $asset['member'];
-                UserService::updateById($id, ['member' => $currentMember]);
-                if (!empty($merchantId) && isset($merchantList[$merchantId])) {
-                    $extend = $merchantList[$merchantId];
-                    if (!empty($extend)) {
-                        $gradeList = MerchantExtendService::getGradeList($extend);
-                        $member = null;
-                        foreach ($gradeList as $grade) {
-                            if ($grade['growth'] < $growth) {
-                                $member = $grade['level'];
-                                continue;
-                            }
-                        }
-                        if (!empty($member)) {
-                            UserAssetService::updateByUserId($id, ['member' => $member]);
-                            UserService::updateById($id, ['member' => $member]);
-                            echo '客户id:' . $id . '会员等级：' . $member . "已更新\n";
-                        }
-                    }
-                }
-            }
-        }
-
-        $sql = "ALTER TABLE xhGoods ADD `briefContent` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '简单内容介绍，移动端添加商品' AFTER `content`;";
-        Yii::$app->db->createCommand($sql)->execute();
-
-        //各个环境开放平台的更新
-        $env = getenv("YII_ENV");
-        //花美灵
-        if ($env == 'dev') {
-            $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
-            $sql .= "insert  into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wxe4428cfe08fc74d6','花美灵','cdbcb1ea6bf2249b269c542c870bd96d',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
-            Yii::$app->db->createCommand($sql)->execute();
-        }
-        //花掌柜助手
-        if ($env == 'test') {
-            $sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
-            $sql .= "insert  into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wx364800c320a0cf53','花掌柜助手','6a83bfa98f3ff5e66b1a85a19c54ebdb',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
-            Yii::$app->db->createCommand($sql)->execute();
-        }
-    }
-
-    //重新拉取并保存国兰客户的头像和图片 shish 2020.1.12
-    public function actionSyncAvatar()
-    {
-        UserService::syncAvatar(12358);
-    }
-
-    //可以重复初始化的一些东西 shish 2020.1.21
-    public function actionRepeatInit($id)
-    {
-        //初始化微信菜单
-        $merchant = xhMerchantService::getById($id);
-        xhWxMenuService::applyInit($merchant);
-    }
-
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "ALTER TABLE `xhMerchant` ADD `deadline` INT NOT NULL DEFAULT 0 COMMENT '帐号过期时间' AFTER `status`;UPDATE `xhMerchant` SET `deadline`=1607589778;";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		
+		//导入省市区
+		$root = dirUtil::getRootDir();
+		$sql = file_get_contents($root . '/region.sql');
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		
+		//将订单商品表的订单id换成自增id
+		$orderGoods = OrderGoodsService::getAllByCondition([], null, '*');
+		if (!empty($orderGoods)) {
+			$ids = array_column($orderGoods, 'orderId');
+			$orderList = OrderService::getAllByCondition(['orderSn' => ['in', $ids]], null, '*', 'orderSn');
+			foreach ($orderList as $orderSn => $val) {
+				$id = $val['id'];
+				OrderGoodsService::updateByCondition(['orderId' => $orderSn], ['orderId' => $id]);
+			}
+		}
+		$sql = "alter table `xhOrderGoods` modify orderId int not null default 0 comment '订单id';";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//商品多款式同步
+		$goodsList = GoodsService::getAllByCondition([], null, '*');
+		if (!empty($goodsList)) {
+			foreach ($goodsList as $goods) {
+				$multiPrice = $goods['multiPrice'];
+				if (!empty($multiPrice)) {
+					$currentIds = explode(',', trim($multiPrice));
+					if (!empty($currentIds)) {
+						$currentIds = array_filter(array_unique($currentIds));
+						$goodsId = $goods['id'];
+						foreach ($currentIds as $currentId) {
+							GoodsStyleService::updateByCondition(['id' => $currentId], ['goodsId' => $goodsId]);
+						}
+					}
+				}
+			}
+		}
+		$sql = "ALTER TABLE xhGoods DROP COLUMN `multiPrice`;";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//商家流水
+		$mCapital = MerchantCapitalService::getAllByCondition([], null, '*');
+		if (!empty($mCapital)) {
+			foreach ($mCapital as $capital) {
+				$relateId = $capital['relateId'];
+				$id = $capital['id'];
+				if (!empty($relateId)) {
+					$order = OrderService::getByCondition(['orderSn' => $relateId]);
+					if (!empty($order)) {
+						$orderId = $order['id'];
+						MerchantCapitalService::updateById($id, ['relateId' => $orderId]);
+					} else {
+						MerchantCapitalService::updateById($id, ['relateId' => 0]);
+					}
+				} else {
+					MerchantCapitalService::updateById($id, ['relateId' => 0]);
+				}
+			}
+		}
+		$sql = "ALTER TABLE `xhMerchantCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//客户流水
+		$uCapital = UserCapitalService::getAllByCondition([], null, '*');
+		if (!empty($uCapital)) {
+			foreach ($uCapital as $capital) {
+				$relateId = $capital['relateId'];
+				$id = $capital['id'];
+				if (!empty($relateId)) {
+					$order = OrderService::getByCondition(['orderSn' => $relateId]);
+					if (!empty($order)) {
+						$orderId = $order['id'];
+						UserCapitalService::updateById($id, ['relateId' => $orderId]);
+					} else {
+						UserCapitalService::updateById($id, ['relateId' => 0]);
+					}
+				} else {
+					UserCapitalService::updateById($id, ['relateId' => 0]);
+				}
+			}
+		}
+		$sql = "ALTER TABLE `xhUserCapital` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id；订单id';";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//客户成长值
+		$userGrowth = UserGrowthService::getAllByCondition([], null, '*');
+		if (!empty($userGrowth)) {
+			foreach ($userGrowth as $relateId => $growth) {
+				$relateId = $growth['relateId'];
+				$id = $growth['id'];
+				if (!empty($relateId)) {
+					$order = OrderService::getByCondition(['orderSn' => $relateId]);
+					if (!empty($order)) {
+						$orderId = $order['id'];
+						UserGrowthService::updateById($id, ['relateId' => $orderId]);
+					} else {
+						UserGrowthService::updateById($id, ['relateId' => 0]);
+					}
+				} else {
+					UserGrowthService::updateById($id, ['relateId' => 0]);
+				}
+			}
+		}
+		$sql = "ALTER TABLE `xhUserGrowth` MODIFY `relateId` INT NOT NULL DEFAULT 0 COMMENT '关联id';ALTER TABLE `xhAdminRoleAuth` ADD merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id' AFTER `endId`;";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		$sql = "DROP TABLE IF EXISTS `xhInformAdmin`;
+CREATE TABLE `xhInformAdmin` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `userId` INT(11) NOT NULL DEFAULT '0' COMMENT '管理员userId',
+  `adminId` INT(11) NOT NULL DEFAULT '0' COMMENT '管理员Id',
+  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `noticeType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '类型',
+  `content` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '内容',
+  `noticeWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '通知方式 0微信1短信',
+  `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '状态 0没有成功 1成功',
+  `sourceType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源类型',
+  `sourceId` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '来源id',
+  `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
+  PRIMARY KEY (`id`)
+) COMMENT='店员消息通知记录';
+DROP TABLE IF EXISTS `xhInformUser`;
+CREATE TABLE `xhInformUser` (
+  `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `userId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户id',
+  `merchantId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id',
+  `noticeType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '类型',
+  `content` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '内容',
+  `noticeWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '通知方式 0微信1短信',
+  `status` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '状态 0没有成功 1成功',
+  `sourceType` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '来源类型',
+  `sourceId` INT(10) UNSIGNED NOT NULL DEFAULT '0' COMMENT '来源id',
+  `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间',
+  PRIMARY KEY (`id`)
+) COMMENT='客户消息通知记录';";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//统计相关
+		//xhStatIncomeMonth
+		$list = StatIncomeMonthService::getAllByCondition([], null, '*');
+		if (!empty($list)) {
+			foreach ($list as $val) {
+				$year = $val['year'];
+				$month = $val['month'];
+				$date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
+				$id = $val['id'];
+				StatIncomeMonthService::updateById($id, ['time' => $date]);
+			}
+		}
+		//xhStatIncomeSourceMonth
+		$list = StatIncomeSourceMonthService::getAllByCondition([], null, '*');
+		if (!empty($list)) {
+			foreach ($list as $val) {
+				$year = $val['year'];
+				$month = $val['month'];
+				$date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
+				$id = $val['id'];
+				StatIncomeSourceMonthService::updateById($id, ['time' => $date]);
+			}
+		}
+		//xhStatOrder
+		$list = StatOrderService::getAllByCondition([], null, '*');
+		if (!empty($list)) {
+			foreach ($list as $val) {
+				$id = $val['id'];
+				$date = date("Ymd", $val['time']);
+				StatOrderService::updateById($id, ['time' => $date]);
+			}
+		}
+		//xhStatOrderMonth
+		$list = StatOrderMonthService::getAllByCondition([], null, '*');
+		if (!empty($list)) {
+			foreach ($list as $val) {
+				$year = $val['year'];
+				$month = $val['month'];
+				$date = date("Ym", strtotime($year . '-' . $month . '-' . '1'));
+				$id = $val['id'];
+				StatOrderMonthService::updateById($id, ['time' => $date]);
+			}
+		}
+		
+		if ($num == 2) {
+			$this->actionInit2();
+		}
+		
+		if ($num == 3) {
+			$this->actionInit2();
+			$this->actionSyncAvatar();
+		}
+		
+	}
+	
+	public function actionInit2()
+	{
+		//更新管理员
+		$sql = 'update `xhAdmin` set password="' . password_hash('123456', PASSWORD_BCRYPT) . '",confirmPassword="' . password_hash('123456', PASSWORD_BCRYPT) . '";update `xhAdmin` set merchantId=12358,platUserId=12543212 where id=1;update `xhAdmin` set merchantId=12359,platUserId=12540901 where id=3;update `xhAdmin` set merchantId=12360 where id=4;update `xhAdmin` set merchantId=12361,platUserId=12540861 where id=5;update `xhStaff` set `password`="' . password_hash('123456', PASSWORD_BCRYPT) . '"';
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//生产环境国兰密码要更新进去
+		if (getenv('YII_ENV') == 'production') {
+			$password = password_hash('glhs610000', PASSWORD_BCRYPT);
+			$confirmPassword = password_hash('454588', PASSWORD_BCRYPT);
+			$sql = "update `xhAdmin` set password='{$password}',confirmPassowrd='{$confirmPassword}' where id=1";
+			Yii::$app->db->createCommand($sql)->execute();
+		}
+		
+		//国兰老客户导入
+		$oldUserList = Yii::$app->db2->createCommand('select * from xhUserOldData where `status`=0')->queryAll();
+		if (!empty($oldUserList)) {
+			foreach ($oldUserList as $user) {
+				$mobile = $user['mobile'];
+				$exists = UserService::getByCondition(['mobile' => $mobile, 'merchantId' => 12358]);
+				if (!empty($exists)) {
+					echo "老客户：'.$mobile.'已经导入过了。\n";
+					continue;
+				}
+				$user['realName'] = $user['userName'];
+				$user['growth'] = $user['integral'];
+				$insertUser = UserService::addUser($user);
+				$id = $user['id'];
+				Yii::$app->db2->createCommand("update xhUserOldData set `status`=1 where id={$id}")->execute();
+				echo "老客户导入生成userId:" . $insertUser['id'] . "\n";
+			}
+		}
+		
+		//更新国兰的菜单分类
+		$sql = "truncate `xhCategory`;insert  into `xhCategory`(`id`,`parentId`,`merchantId`,`categoryName`,`description`,`img`,`goodsNum`,`sold`,`inTurn`,`status`) values (1,0,12358,'花束','唯美花束','',0,0,15,1),(2,0,12358,'花盒','时尚花盒','',0,0,14,1),(3,0,12358,'开业花篮','开业花篮','',0,0,0,1),(4,0,12358,'婚礼用花','婚礼用花','',0,0,0,1),(5,0,12358,'会议用花','会议用花','',0,0,0,1),(9,0,12358,'蝴蝶兰专区','蝴蝶兰','',0,0,4,1),(87,0,12358,'花篮','时尚礼篮','',0,0,4,1),(88,0,12358,'植物-微景观','植物-微景观','',0,0,4,1);";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//更新菜单与商品对应关系
+		Yii::$app->db->createCommand("truncate `xhGoodsCategory`;")->execute();
+		$goodsCategory = Yii::$app->db2->createCommand('select * from `xhGoodsCategory` where `merchantId`=12358')->queryAll();
+		if (!empty($goodsCategory)) {
+			foreach ($goodsCategory as $val) {
+				$cId = $val['cId'];
+				$gId = $val['gId'];
+				$inTurn = $val['inTurn'];
+				$merchantId = $val['merchantId'];
+				GoodsCategoryService::add(['gId' => $gId, 'cId' => $cId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
+				echo $cId . ' ' . $gId . "\n";
+				
+			}
+		}
+		$goodsUsage = Yii::$app->db2->createCommand('select * from `xhGoodsUsage` where `merchantId`=12358')->queryAll();
+		if (!empty($goodsUsage)) {
+			foreach ($goodsUsage as $val) {
+				$usageId = $val['usageId'];
+				$goodsId = $val['goodsId'];
+				$inTurn = $val['inTurn'];
+				$merchantId = $val['merchantId'];
+				GoodsCategoryService::add(['gId' => $goodsId, 'cId' => $usageId, 'inTurn' => $inTurn, 'status' => 1, 'merchantId' => $merchantId]);
+				echo $usageId . ' ' . $goodsId . "\n";
+			}
+		}
+		
+		//会员打折和会员等级要同步，要先导老客户 shish 2020.1.12
+		$merchantList = MerchantExtendService::getAllByCondition([], null, '*', 'merchantId');
+		$userAssetList = UserAssetService::getAllByCondition([], null, '*');
+		if (!empty($userAssetList)) {
+			foreach ($userAssetList as $asset) {
+				$id = $asset['userId'];
+				$merchantId = $asset['merchantId'];
+				$growth = $asset['growth'];
+				$currentMember = $asset['member'];
+				UserService::updateById($id, ['member' => $currentMember]);
+				if (!empty($merchantId) && isset($merchantList[$merchantId])) {
+					$extend = $merchantList[$merchantId];
+					if (!empty($extend)) {
+						$gradeList = MerchantExtendService::getGradeList($extend);
+						$member = null;
+						foreach ($gradeList as $grade) {
+							if ($grade['growth'] < $growth) {
+								$member = $grade['level'];
+								continue;
+							}
+						}
+						if (!empty($member)) {
+							UserAssetService::updateByUserId($id, ['member' => $member]);
+							UserService::updateById($id, ['member' => $member]);
+							echo '客户id:' . $id . '会员等级：' . $member . "已更新\n";
+						}
+					}
+				}
+			}
+		}
+		
+		$sql = "ALTER TABLE xhGoods ADD `briefContent` VARCHAR(1000) NOT NULL DEFAULT '' COMMENT '简单内容介绍，移动端添加商品' AFTER `content`;";
+		Yii::$app->db->createCommand($sql)->execute();
+		
+		//各个环境开放平台的更新
+		$env = getenv("YII_ENV");
+		//花美灵
+		if ($env == 'dev') {
+			$sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
+			$sql .= "insert  into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wxe4428cfe08fc74d6','花美灵','cdbcb1ea6bf2249b269c542c870bd96d',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
+			Yii::$app->db->createCommand($sql)->execute();
+		}
+		//花掌柜助手
+		if ($env == 'test') {
+			$sql = "delete from `xhMerchant`;delete from `xhWxOpen`;";
+			$sql .= "insert  into `xhWxOpen`(`id`,`appId`,`openName`,`appSecret`,`merchantId`,`adminId`,`token`,`verifyTicket`,`verifyTicketTime`,`componentAccessToken`,`componentAccessTokenTime`,`aesKey`,`preAuthCode`,`preAuthCodeTime`,`createTime`,`updateTime`) values (1,'wx364800c320a0cf53','花掌柜助手','6a83bfa98f3ff5e66b1a85a19c54ebdb',0,0,'XH11464773308','ticket@@@mUTfkCa6p-W5fIB_YvWDiSzUvsCVJNN6fELjsHnZ07Nvz5hfRMyfHzmjn3ZPK9Gi5aqY2_H7ruxnX2cdYdjRIg','2020-01-09 21:04:50','29_RQZoasQKtSPVa754Inhu3aKiAfou3KYGJT5SGtqWy74cHoL3aEfPt0xTR6JMuULyDN4-25fBDTE-VS_jtalbq6WTbb5d7B-K4dUSS3zDbKykNtctzFnBBnDzkbGRXcw2b8OS8JY_HHblIlFZTVLcAGAGIY','2020-01-09 21:36:26','Gm2BIikJaExAbiyafGoJGFbEsECb4mDEnyEYgl9WXW5','preauthcode@@@IJXez4FxmgNRLow1rmxhAxM2eaKQYY6g1ocsK8Koe4v9mx7mr07arTNZTLxe2Sf2','2019-12-19 16:13:58','2019-04-17 14:49:19','2020-01-09 12:54:50');";
+			Yii::$app->db->createCommand($sql)->execute();
+		}
+	}
+	
+	//重新拉取并保存国兰客户的头像和图片 shish 2020.1.12
+	public function actionSyncAvatar()
+	{
+		UserService::syncAvatar(12358);
+	}
+	
+	//可以重复初始化的一些东西 shish 2020.1.21
+	public function actionRepeatInit($id)
+	{
+		//初始化微信菜单
+		$merchant = xhMerchantService::getById($id);
+		xhWxMenuService::applyInit($merchant);
+	}
+	
 }