快捷支付

app/client/controllers/OrderController.php

@@ -24,16 +24,6 @@ use common\components\util;
 class OrderController extends BaseController
 {
 	
-	//下单要用到的相关信息 shish 2019.12.6
-	public function actionOrderRelate()
-	{
-		$regionTree = RegionService::tree();
-		$shop = ShopService::getDefaultShopInfo($this->merchant);
-		$freight = MerchantExtendService::getFreight($this->merchantExtend);
-		$out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree];
-		util::success($out);
-	}
-	
 	//商城下单操作 shish 2019.12.3
 	public function actionCreateOrder()
 	{
@@ -134,6 +124,16 @@ class OrderController extends BaseController
 		util::success(['orderId' => $orderId, 'totalPrice' => $showPrice, 'couponId' => $couponId]);
 	}
 	
+	//下单要用到的相关信息 shish 2019.12.6
+	public function actionOrderRelate()
+	{
+		$regionTree = RegionService::tree();
+		$shop = ShopService::getDefaultShopInfo($this->merchant);
+		$freight = MerchantExtendService::getFreight($this->merchantExtend);
+		$out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree];
+		util::success($out);
+	}
+	
 	//余额支付 shish 2019.12.6
 	public function actionBalancePay()
 	{
@@ -175,10 +175,12 @@ class OrderController extends BaseController
 		$openId = $this->user['openId'];
 		$typeList = configDict::getConfig('capitalType');
 		$capitalType = $typeList['xhOrder']['id'];
-		$attach = "couponId=" . $couponId . "&capitalType=" . $capitalType;//将流水类型、代金劵传过去
+		//将流水类型、代金劵传过去
+		$attach = "couponId=" . $couponId . "&capitalType=" . $capitalType;
 		
+		//订单30分钟后过期
 		$now = time();
-		$expireTime = $now + 1800;//订单30分钟后过期
+		$expireTime = $now + 1800;
 		
 		$wx = Yii::getAlias("@vendor/weixin");
 		require_once($wx . '/lib/WxPay.Api.php');
@@ -214,101 +216,46 @@ class OrderController extends BaseController
 		OrderService::updateById($orderId, $updateData);
 		util::success($newParams);
 	}
-	
-	//快速付款订单
-	public function actionFastWxPay()
+
+	//快捷付款订单
+	public function actionFastPay()
 	{
 		ini_set('date.timezone', 'Asia/Shanghai');
 		$post = Yii::$app->request->post();
-		$payWay = isset($post['payWay']) ? $post['payWay'] : '';
+		$payWay = isset($post['payWay']) ? $post['payWay'] : 0;
 		$shopId = isset($post['shopId']) ? $post['shopId'] : 0;
-		//来源 0自建商城 1门店 2微信朋友圈 3淘宝
-		$sourceType = isset($post['sourceType']) ? $post['sourceType'] : 0;
-		
-		$shopInfo = xhShop::find()->where(['id' => $shopId])->one();
-		if (empty($shopInfo) || $shopInfo->merchantId != $this->merchantId) {
-			util::fail('门店无效');
-		}
-		
-		unset($post['_csrf']);
-		unset($post['payWay']);
+		//验证门店是否有效
+		$shopInfo = ShopService::getById($shopId);
+		ShopService::valid($shopInfo, $this->merchantId);
+		//门店订单
+		$sourceType = 1;
 		$post['userId'] = $this->userId;
-		$prePrice = round($post['prePrice'], 2);//四舍五入，保留二位小数
-		
-		$userAsset = xhUserAssetService::getByUserId($this->userId);
-		$level = isset($userAsset['memberLevel']) ? $userAsset['memberLevel'] : 0;
-		$merchantExtend = xhMerchantExtendService::getByMerchantId($this->merchantId);
-		$memberIntegral = xhMerchantExtendService::getGradeList($merchantExtend, 'desc');
-		Yii::info(json_encode($merchantExtend));
-		Yii::info(json_encode($memberIntegral));
-		$discount = isset($memberIntegral[$level]['discount']) ? $memberIntegral[$level]['discount'] : $memberIntegral[$level]['discount'];
+		$prePrice = round($post['prePrice'], 2);
 		$actPrice = $prePrice;
-		$couponId = isset($post['couponId']) && !empty($post['couponId']) ? $post['couponId'] : 0;
-		Yii::info($this->userId . ' ' . $level . ' ' . $discount);
-		//没有优惠券才能使用会员折扣 shish 2019.8.30
-		if (!empty($discount) && $prePrice >= 1 && empty($couponId)) {
-			$currentPrice = ($prePrice * $discount) / 100;
-			$actPrice = substr(sprintf("%.3f", $currentPrice), 0, -2);
-		}
-		//没有优惠卷，微信朋友圈付款才给随机优惠金额 shish 2019.9.12
-		if ($sourceType == 2 && empty($couponId)) {
-			$discountAmount = OrderService::getRandDiscount($actPrice);
-			//测试环境直接随机优惠0.01
-			if (isset(Yii::$app->params['merchant'])) {
-				$merchant = Yii::$app->params['merchant'];
-				if ($merchant['merchantName'] == '花美灵') {
-					$discountAmount = 0.01;
-				}
-			}
-			$actPrice = stringUtil::calcSub($actPrice, $discountAmount);
-			$post['discountType'] = 2;//优惠类型是：付款随机优惠
-			$post['discountAmount'] = $discountAmount;
-		}
-		$post['actPrice'] = $actPrice;
 		$post['payStyle'] = 0;
 		$post['merchantId'] = $this->merchantId;
 		$now = time();
 		$expireTime = $now + 300;//订单5分钟后过期
 		$post['createTime'] = date("Y-m-d H:i:s", $now);
 		$post['deadline'] = $expireTime;
-		if (!empty($couponId)) {
-			$time = time();
-			$coupon = CouponService::getById($couponId);
-			if ($coupon['deadline'] <= $time) {
-				util::fail('优惠卷已经过期');
-			}
-			if ($coupon['status'] == 1) {
-				util::fail('优惠卷已经使用');
-			}
-			if ($coupon['meetAmount'] > $post['prePrice']) {
-				util::fail('消费金额不足' . $coupon['meetAmount'] . '元');
-			}
-			$post['actPrice'] = stringUtil::calcSub($post['prePrice'], $coupon['amount']);//浮点相减
-			$post['discountAmount'] = $coupon['amount'];
-			$post['discountType'] = 0;
-		}
-		if ($post['actPrice'] <= 0) {
-			util::fail('消费金额太低');
-		}
-		if ($this->isWeixin) {
-			$post['modPriceStatus'] = 1;//微信已经提交不能再修改价格
+		if ($actPrice <= 0) {
+			util::fail('请填写正确的金额');
 		}
+		//微信支付订单提交不能修改价格
+		$post['modPriceStatus'] = $this->isWeixin ? 1 : 0;
 		$post['sourceType'] = $sourceType;
-		$post['id'] = stringUtil::generateOrderNo($this->merchantId, $this->userId);
-		$payment = xhOrderService::add($post);
-		$orderId = $payment['id'];
-		
-		if ($payWay == 'balance') {//余额支付
-			util::success(['orderId' => $orderId]);
-		}
-		$name = '购买商品';
-		$totalFee = $post['actPrice'];
-		if ($this->isWeixin) {
+		$order = OrderService::addOrder($post);
+		$orderId = $order['id'];
+		$merchantId = $this->merchantId;
+		$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
+
+		if ($payWay == 0) {
+
+			$orderId = $order['id'];
+			$name = '购买商品';
+			$totalFee = $actPrice;
 			$userId = $post['userId'];
-			$user = xhUserService::getById($userId);
-			if ($user['merchantId'] != $this->merchantId) {
-				util::fail('非法用户');
-			}
+			$user = UserService::getById($this->userId);
 			$openId = $user['openId'];
 			$typeList = configDict::getConfig('capitalType');
 			$capitalType = $typeList['xhOrder']['id'];
@@ -326,12 +273,9 @@ class OrderController extends BaseController
 			$input->SetNotify_url($this->frontUrl . '/notice/weixin-callback/');
 			$input->SetTrade_type("JSAPI");
 			
-			
-			//服务商 代设置微信支付,要添加的参数设置
+			//花卉宝代为申请的微信支付
 			if ($this->merchantExtend['generalMerchant'] == 1) {
-				//$input->SetOpenid($openId);
 				$input->SetSub_openid($openId);
-				//自设置 微信支付
 			} else {
 				$input->SetOpenid($openId);
 			}
@@ -342,147 +286,93 @@ class OrderController extends BaseController
 			$newParams = json_decode($jsApiParameters, true);
 			$newParams['orderId'] = $orderId;
 			util::success($newParams);
-		}
-		util::success(['orderId' => $orderId]);
-	}
-	
-	//快捷支付使用支付宝付款 shish 2019.12.3
-	public function actionFastZfbPay()
-	{
-		header("Content-type: text/html; charset=utf-8");
-		$get = Yii::$app->request->get();
-		$orderId = isset($get['orderId']) ? $get['orderId'] : 0;
-		$couponId = isset($get['couponId']) ? $get['couponId'] : 0;
-		$pay = xhOrderService::getById($orderId);
-		$merchantId = $pay['merchantId'];
-		
-		if ($merchantId == 12358) {
-			$config = array(
-				//应用ID,您的APPID。
-				'app_id' => "2019041663930158",
-				//商户私钥，您的原始格式RSA私钥
-				'merchant_private_key' => "MIIEpAIBAAKCAQEA0NGNBMu5BkHU+ztmGhGdsJC1n2ZbXn4uoaYNni2eriPHJHG8vCWL1vv3W+gxX3twnmdQ57s3hFWfd5PIwMm+8QIwiPucckbmTEm2rC2g4j+UnUiXzICJWjlzlCWiBftrsctKKwjsZTPiuDJzUKmYRD4DYWy1+4Uh6k6x98qbALuiFFrh7esvsaSepZfQ+zBLzMVfrtPABkwEtOAzUL4hz4YW+EFfqyj3mu4LP4M+zBWSKRs0iCzJILG/7JA4OEkDJ89gGZ6LiaITUgffV2tg/IS81aNBfutb3tICBr1PLlKYCV0ois54kqmmP7anNrn/KRFI/k6iLd82e1HEoHhvDwIDAQABAoIBAQCr+PgPTAv8CDl0Ek4bCAj7AaJiPTTgVEDpJc0vSNjXB2YZMIZD2RQaoHXtvgLzZMCx49pwjfHBzZZAL3h0tXHIIIqCNd15C8TcbRTBJe7KhZxKEB/b7ruvj4MNLhUKoi3mRcq2OGofSqTcF8h6VMGu6fd0w8f39YOh6N+Od9BBv8aL7CtBwQQihzatBdr2CyjH50TmlVWfEz2YKoZBGRuMy7EzLZgmR5IzEJC36tOBAg5DORNkEMAuzvnmBQznZCtzMZHW5Ytlh/3kbCUMsrWL6ioox/mel4DoQNnQ1kZ60f7Gny3I+0HiJ+vxVBZ3Nyd8FCVbAlq6avkB3ZGoCx0xAoGBAP/Mhf8X81mLK80TQsSWYPmnjnYkOZ7vIpNc/b6/N+BKAAjWB+0wXJ73nhuzB8cuJBz6TK8RE2uUuiUbiVP1jkrQ2EoCWadndKE1fcLFSSOYlN9rxfINcLicdNAFYu0m8He5cqPpW+06sD8HGOlWeBOyPvitXBjBeOB9dPWBpVkpAoGBAND7kruod1T4ErtOavYv4ErlyN0O6PpQR3MBlnzXnJfKLdaMvc/JaqjZtk14Nl9RnBDzN6d93LHxariyuTHw9mdGAPOpxcUEsUdOw56eRIzhyY8lz0c+lvE32r2NypuzK/2BGP5xR+spe7D4esuhLQhUYjByTWbgLQD+7724QrV3AoGAYuO2ib/AnEVpUYa4sTdRljJoqNOoUwEv5Lh2gF98QoFZMhFMTy37IJmpzhuQTjhQTcOWEbgQQe7lZ6MVnBe6QsIqW7I85rLgK9J6I+oRNGmwZA9OHx2DDlut7R2n+Pas0BwpbaSxnSyrJjKgNtTu5u5p2clraUaibGcT6DWOrsECgYEAspjM5aMrmGoJWBnEP3Da9ic6afD8Gi/RX+/TdA2vvekDE4BkFtfDV1n3+mzpyrwr7DBvN6zQlyICWqYirxOHAOtKlPJaGe3Qs2gUtdH8M4oifzuI0RIkXTGmtqgepsGQrq1NduXI2KgzFSLFjpDHs36qC00j6O9chqVYrYJzQDECgYBQyIWx3BBEUgWCbLTT8QeUdf+EnZSLZzIIQFn88zImhqkTSMbpBmcZpI4oOlWiM8i4XOaEzu+EDFIRAchIbVlDgBV1OprAN5BAez03oyh1JkCDYrsEj7FMqWSmbxiY2uubPshMLEGdPU+I46oJTO6FzMyG6hnQrK+/ne0zH8A5LA==",
-				//异步通知地址
-				'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' => "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkFYqNkoWJIx37fGcUBbnZJ+APf14YHO1cBdp9RFSasxj9gm+pwbtK3J6uRuPygK0K/OCgvtuFJ6mZT3tNUEgSZMjnre5Z7IzQnzIBUYFPUEO85s+/RDr5HnAqgOIbu9GL8GWrU6g6uj+QmW591vXckmsbujPx0S3IP+TMOQZWA0JVvDu+T9yGfv3pacKUgdNvYnas/si3278TL4DeIVjZ4OmbbEPmEhD/OhSVlTSWEOdqLuV4DvEpmrGa8XoyfFEtgV9qSVb454Qwu5Nw/ATc9+ssMbN6ROXzOQbAAfqAe6riNUtKEHGVaCynfUAYNyR6yvJb8+VkMR02nBEDC9QHQIDAQAB",
-			);
-		} else {
-			$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",
 			
-			);
-		}
-		
-		
-		$alipayWap = Yii::getAlias("@vendor/alipayWap");
-		require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
-		require_once($alipayWap . '/wappay/buildermodel/AlipayTradeWapPayContentBuilder.php');
-		//require_once($alipayWap . '/config.php');
-		
-		
-		$totalFee = $pay['actPrice'];
-		$out_trade_no = $orderId;//商户订单号，商户网站订单系统中唯一订单号，必填
-		$subject = '购买商品';//订单名称，必填
-		$total_amount = $totalFee;//付款金额，必填
-		$body = '';//商品描述，可空
-		$timeout_express = "1m";//超时时间
-		
-		$typeList = configDict::getConfig('capitalType');
-		$capitalType = $typeList['xhOrder']['id'];
-		$passbackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&merchantId=' . $merchantId;//将流水类型、优惠卷传过去
-		$passbackParams = urlencode($passbackParams);
-		
-		$payRequestBuilder = new \AlipayTradeWapPayContentBuilder();
-		$payRequestBuilder->setBody($body);
-		$payRequestBuilder->setSubject($subject);
-		$payRequestBuilder->setOutTradeNo($out_trade_no);
-		$payRequestBuilder->setTotalAmount($total_amount);
-		$payRequestBuilder->setTimeExpress($timeout_express);
-		//在异步通知时将该参数原样返回
-		$payRequestBuilder->setPassbackParams($passbackParams);
-		//同步通知
-		$returnUrl = Yii::$app->params['frontUrl'] . "/notice/pay-alipay-sync";
-		//异步通知
-		$notifyUrl = Yii::$app->params['frontUrl'] . "/notice/alipay-async";
-		$payResponse = new \AlipayTradeService($config);
-		$result = $payResponse->wapPay($payRequestBuilder, $returnUrl, $notifyUrl);
-		util::success($result);
-	}
-	
-	/**
-	 * 订单 - 支付宝支付
-	 */
-	public function actionZfbPay()
-	{
-		header("Content-type: text/html; charset=utf-8");
-		$alipayWap = Yii::getAlias("@vendor/alipayWap");
-		require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
-		require_once($alipayWap . '/wappay/buildermodel/AlipayTradeWapPayContentBuilder.php');
-		require_once($alipayWap . '/config.php');
-		
-		$get = Yii::$app->request->get();
-		$orderId = isset($get['orderId']) ? $get['orderId'] : 0;
-		$couponId = isset($get['couponId']) ? $get['couponId'] : 0;
-		$orderData = xhOrderService::getById($orderId);
-		$waitForPay = configDict::getConfig('payStatus', 'waitForPay');
-		if ($orderData['payStatus'] != $waitForPay) {
-			echo '已经支付成功';
-			util::end();
+		} elseif ($payWay == 1) {
+			
+			
+			if ($merchantId == 12358) {
+				$config = array(
+					//应用ID,您的APPID。
+					'app_id' => "2019041663930158",
+					//商户私钥，您的原始格式RSA私钥
+					'merchant_private_key' => "MIIEpAIBAAKCAQEA0NGNBMu5BkHU+ztmGhGdsJC1n2ZbXn4uoaYNni2eriPHJHG8vCWL1vv3W+gxX3twnmdQ57s3hFWfd5PIwMm+8QIwiPucckbmTEm2rC2g4j+UnUiXzICJWjlzlCWiBftrsctKKwjsZTPiuDJzUKmYRD4DYWy1+4Uh6k6x98qbALuiFFrh7esvsaSepZfQ+zBLzMVfrtPABkwEtOAzUL4hz4YW+EFfqyj3mu4LP4M+zBWSKRs0iCzJILG/7JA4OEkDJ89gGZ6LiaITUgffV2tg/IS81aNBfutb3tICBr1PLlKYCV0ois54kqmmP7anNrn/KRFI/k6iLd82e1HEoHhvDwIDAQABAoIBAQCr+PgPTAv8CDl0Ek4bCAj7AaJiPTTgVEDpJc0vSNjXB2YZMIZD2RQaoHXtvgLzZMCx49pwjfHBzZZAL3h0tXHIIIqCNd15C8TcbRTBJe7KhZxKEB/b7ruvj4MNLhUKoi3mRcq2OGofSqTcF8h6VMGu6fd0w8f39YOh6N+Od9BBv8aL7CtBwQQihzatBdr2CyjH50TmlVWfEz2YKoZBGRuMy7EzLZgmR5IzEJC36tOBAg5DORNkEMAuzvnmBQznZCtzMZHW5Ytlh/3kbCUMsrWL6ioox/mel4DoQNnQ1kZ60f7Gny3I+0HiJ+vxVBZ3Nyd8FCVbAlq6avkB3ZGoCx0xAoGBAP/Mhf8X81mLK80TQsSWYPmnjnYkOZ7vIpNc/b6/N+BKAAjWB+0wXJ73nhuzB8cuJBz6TK8RE2uUuiUbiVP1jkrQ2EoCWadndKE1fcLFSSOYlN9rxfINcLicdNAFYu0m8He5cqPpW+06sD8HGOlWeBOyPvitXBjBeOB9dPWBpVkpAoGBAND7kruod1T4ErtOavYv4ErlyN0O6PpQR3MBlnzXnJfKLdaMvc/JaqjZtk14Nl9RnBDzN6d93LHxariyuTHw9mdGAPOpxcUEsUdOw56eRIzhyY8lz0c+lvE32r2NypuzK/2BGP5xR+spe7D4esuhLQhUYjByTWbgLQD+7724QrV3AoGAYuO2ib/AnEVpUYa4sTdRljJoqNOoUwEv5Lh2gF98QoFZMhFMTy37IJmpzhuQTjhQTcOWEbgQQe7lZ6MVnBe6QsIqW7I85rLgK9J6I+oRNGmwZA9OHx2DDlut7R2n+Pas0BwpbaSxnSyrJjKgNtTu5u5p2clraUaibGcT6DWOrsECgYEAspjM5aMrmGoJWBnEP3Da9ic6afD8Gi/RX+/TdA2vvekDE4BkFtfDV1n3+mzpyrwr7DBvN6zQlyICWqYirxOHAOtKlPJaGe3Qs2gUtdH8M4oifzuI0RIkXTGmtqgepsGQrq1NduXI2KgzFSLFjpDHs36qC00j6O9chqVYrYJzQDECgYBQyIWx3BBEUgWCbLTT8QeUdf+EnZSLZzIIQFn88zImhqkTSMbpBmcZpI4oOlWiM8i4XOaEzu+EDFIRAchIbVlDgBV1OprAN5BAez03oyh1JkCDYrsEj7FMqWSmbxiY2uubPshMLEGdPU+I46oJTO6FzMyG6hnQrK+/ne0zH8A5LA==",
+					//异步通知地址
+					'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' => "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkFYqNkoWJIx37fGcUBbnZJ+APf14YHO1cBdp9RFSasxj9gm+pwbtK3J6uRuPygK0K/OCgvtuFJ6mZT3tNUEgSZMjnre5Z7IzQnzIBUYFPUEO85s+/RDr5HnAqgOIbu9GL8GWrU6g6uj+QmW591vXckmsbujPx0S3IP+TMOQZWA0JVvDu+T9yGfv3pacKUgdNvYnas/si3278TL4DeIVjZ4OmbbEPmEhD/OhSVlTSWEOdqLuV4DvEpmrGa8XoyfFEtgV9qSVb454Qwu5Nw/ATc9+ssMbN6ROXzOQbAAfqAe6riNUtKEHGVaCynfUAYNyR6yvJb8+VkMR02nBEDC9QHQIDAQAB",
+				);
+			} else {
+				$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",
+				);
+			}
+			
+			$alipayWap = Yii::getAlias("@vendor/alipayWap");
+			require_once($alipayWap . '/wappay/service/AlipayTradeService.php');
+			require_once($alipayWap . '/wappay/buildermodel/AlipayTradeWapPayContentBuilder.php');
+			
+			$totalFee = $order['actPrice'];
+			$out_trade_no = $orderId;//商户订单号，商户网站订单系统中唯一订单号，必填
+			$subject = '购买商品';//订单名称，必填
+			$total_amount = $totalFee;//付款金额，必填
+			$body = '';//商品描述，可空
+			$timeout_express = "1m";//超时时间
+			
+			$typeList = configDict::getConfig('capitalType');
+			$capitalType = $typeList['xhOrder']['id'];
+			$passbackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&merchantId=' . $merchantId;//将流水类型、优惠卷传过去
+			$passbackParams = urlencode($passbackParams);
+			
+			$payRequestBuilder = new \AlipayTradeWapPayContentBuilder();
+			$payRequestBuilder->setBody($body);
+			$payRequestBuilder->setSubject($subject);
+			$payRequestBuilder->setOutTradeNo($out_trade_no);
+			$payRequestBuilder->setTotalAmount($total_amount);
+			$payRequestBuilder->setTimeExpress($timeout_express);
+			//在异步通知时将该参数原样返回
+			$payRequestBuilder->setPassbackParams($passbackParams);
+			//同步通知
+			$returnUrl = Yii::$app->params['frontUrl'] . "/notice/pay-alipay-sync";
+			//异步通知
+			$notifyUrl = Yii::$app->params['frontUrl'] . "/notice/alipay-async";
+			$payResponse = new \AlipayTradeService($config);
+			$result = $payResponse->wapPay($payRequestBuilder, $returnUrl, $notifyUrl);
+			util::success($result);
+			
+			
+		} else {
+			//验证支付密码是否正确
+			$payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
+			UserService::validPayPassword($payPassword, $this->user);
+			$typeList = configDict::getConfig('capitalType');
+			$capitalType = $typeList['xhOrder']['id'];
+			$totalFee = $order['actPrice'];
+			xhPayToolService::balancePay($orderId, $totalFee, $capitalType, $couponId);
+			util::success('支付成功');
 		}
-		$merchantId = $orderData['merchantId'];
-		$out_trade_no = $orderId;//商户订单号，商户网站订单系统中唯一订单号，必填
-		$subject = $orderData['orderName'];//订单名称，必填
-		$total_amount = $orderData['actPrice'];;//付款金额，必填
-		$body = '';//商品描述，可空
-		$timeout_express = "1m";//超时时间
-		
-		$typeList = configDict::getConfig('capitalType');
-		$capitalType = $typeList['xhOrder']['id'];
-		$passbackParams = 'capitalType=' . $capitalType . '&couponId=' . $couponId . '&merchantId=' . $merchantId;//将流水类型、代金劵传过去
-		$passbackParams = urlencode($passbackParams);
-		
-		$payRequestBuilder = new \AlipayTradeWapPayContentBuilder();
-		$payRequestBuilder->setBody($body);
-		$payRequestBuilder->setSubject($subject);
-		$payRequestBuilder->setOutTradeNo($out_trade_no);
-		$payRequestBuilder->setTotalAmount($total_amount);
-		$payRequestBuilder->setTimeExpress($timeout_express);
-		$payRequestBuilder->setPassbackParams($passbackParams);//在异步通知时将该参数原样返回
-		$returnUrl = Yii::$app->params['frontUrl'] . "/notice/order-alipay-sync";
-		$payResponse = new \AlipayTradeService($config);
-		$result = $payResponse->wapPay($payRequestBuilder, $returnUrl, $config['notify_url']);
-		util::success($result);
 	}
-	
+
 }

biz/merchant/services/ShopService.php

@@ -41,5 +41,16 @@ class ShopService extends BaseService
 		$defaultShopId = $merchant['defaultShopId'];
 		return ShopClass::getById($defaultShopId);
 	}
-
+	
+	//验证门店
+	public static function valid($shopInfo, $merchantId)
+	{
+		if (isset($shopInfo['merchantId']) == false) {
+			util::fail('门店无效');
+		}
+		if ($shopInfo['merchantId'] != $merchantId) {
+			util::fail('您没有权限访问');
+		}
+	}
+	
 }

sql.txt

@@ -4,6 +4,7 @@ ALTER TABLE xhOrder MODIFY `payStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '0待
 RENAME TABLE xhUserIntegral TO xhUserGrowth;
 ALTER TABLE xhUserGrowth CHANGE `integral` `growth` INT NOT NULL DEFAULT 0 COMMENT '当前成长值';
 ALTER TABLE xhUserGrowth MODIFY `num` INT NOT NULL DEFAULT 0 COMMENT '增加或减少的成长值';
+ALTER TABLE xhOrder DROP COLUMN `payStyle`;
 
 2019.12.5 shish
 ALTER TABLE xhOrderGoods CHANGE `multipleTitle` `goodsStyleName` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '款式名称';