支付流程

app-ghs/controllers/NoticeController.php

@@ -6,136 +6,142 @@ use bizGhs\express\services\DadaExpressServices;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\OrderExpressClass;
 use bizGhs\order\classes\OrderSendClass;
+use common\components\dict;
 use Yii;
 use common\components\util;
-use common\services\xhPayToolService;
+use biz\recharge\classes\RechargeClass;
 
 class NoticeController extends PublicController
 {
 
-	public $categoryList;
-
-	//微信支付异步回调
-	public function actionWxCallback()
-	{
-		$postStr = file_get_contents('php://input');//接收微信服务器返回的xml消息体
-		if (empty($postStr)) {
-			util::end();
-		}
-		$postObj = simplexml_load_string($postStr, 'SimpleXMLElement', LIBXML_NOCDATA);
-		if ($postObj->return_code != 'SUCCESS') {
-			Yii::warning('return_code error:' . $postObj->return_code);
-			util::end();
-		}
-		$orderSn = $postObj->out_trade_no;
-		$total_fee = $postObj->total_fee;
-		$totalFee = $total_fee / 100;
-		$attach = $postObj->attach;
-		//接收流水类型、代金劵
-		parse_str($attach);
-		$couponId = isset($couponId) ? $couponId : 0;
-		//流水类型
-		$capitalType = isset($capitalType) ? $capitalType : null;
-		$wxPayType = isset($wxPayType) ? $wxPayType : 0;
-		if (isset($capitalType) == false) {
-			Yii::warning('capitalType empty,orderId:' . $orderSn);
-			util::end();
-		}
-		$callbackParams = ['wxPayType' => $wxPayType];
-		$return = xhPayToolService::wxPay($callbackParams, $orderSn, $totalFee, $capitalType, $couponId);//支付回调流程
-		if (isset($return['code']) && $return['code'] == 'A0002') {
-			Yii::warning('callback exec and failed,capitalType:' . $capitalType . ' orderSn:' . $orderSn);
-			util::end();
-		}
-		echo '<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>';
-	}
-
-	//支付宝异步通知
-	public function actionAliCallback()
-	{
-
-		echo '此方法还没有调试';
-		Yii::$app->end();
-
-		header("Content-type: text/html; charset=utf-8");
-		$aliWap = Yii::getAlias("@vendor/alipayWap");
-		$orderSn = $_POST['out_trade_no'];//商户订单号
-		$pay = xhOrderService::getByOrderSn($orderSn);
-		if (empty($pay)) {
-			Yii::warning('没有找到订单：orderSn:' . $orderSn);
-			util::end();
-		}
-		$orderId = $pay['id'];//商户订单号
-		$merchantId = isset($pay['merchantId']) ? $pay['merchantId'] : 0;
-		$extend = MerchantExtendService::getByMerchantId($merchantId);
-		$config = [
-			//应用ID,您的APPID。
-			'app_id' => $extend['alipayPId'],
-			//商户私钥，您的原始格式RSA私钥
-			'merchant_private_key' => $extend['alipayKey'],
-			//异步通知地址
-			'notify_url' => Yii::$app->params['frontUrl'] . "/notice/ali-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' => $extend['alipayPublicKey'],
-		];
-
-		require_once($aliWap . '/wappay/service/AlipayTradeService.php');
-		require_once($aliWap . '/wappay/buildermodel/AlipayTradeQueryContentBuilder.php');//查询接口
-
-		$arr = $_POST;
-		$aliService = new \AlipayTradeService($config);
-		$aliService->writeLog(var_export($_POST, true));
-		$result = $aliService->check($arr);
-		Yii::info('check:' . $result);
-		if ($result) {//验证成功
-			$tradeNo = $_POST['trade_no'];//支付宝交易号
-			$tradeStatus = $_POST['trade_status'];//交易状态
-			$totalFee = $_POST['total_amount'];
-			$appId = $_POST['app_id'];
-			$passBackParams = $_POST['passback_params'];
-			$passBackParams = urldecode($passBackParams);
-			parse_str($passBackParams);//接收流水类型、代金劵
-			$couponId = isset($couponId) ? $couponId : 0;
-			$capitalType = isset($capitalType) ? $capitalType : null;//流水类型
-
-			$RequestBuilder = new \AlipayTradeQueryContentBuilder();
-			$RequestBuilder->setTradeNo($tradeNo);
-			$queryResult = $aliService->Query($RequestBuilder);
-			$aliId = $queryResult->buyer_user_id;
-			$aliAccount = $queryResult->buyer_logon_id;//买家的支付宝帐号，不完整，带*号
-			$aliParams = ['alipayId' => $aliId, 'alipayAccount' => $aliAccount];
-
-			if (isset($capitalType) == false) {
-				Yii::warning('capitalType empty, orderId:' . $orderId);
-				util::end();
-			}
-			if ($config['app_id'] != $appId) {
-				Yii::warning('app_id disagree, orderId:' . $orderId . ' config app_id:' . $config['app_id'] . ' appId:' . $appId);
-				util::end();
-			}
-			if ($tradeStatus == 'TRADE_FINISHED' || $tradeStatus == 'TRADE_SUCCESS') {
-				$callbackParams = [];
-				$return = xhPayToolService::alipay($callbackParams, $orderSn, $totalFee, $capitalType, $couponId, $aliParams);//支付回调流程
-				if ($return['code'] == 'A0002') {
-					Yii::warning('callback exec and failed,capitalType:' . $capitalType . ' orderId:' . $orderId);
-					util::end();
-				}
-			}
-			//请不要修改或删除
-			echo "success";
-			util::end();
-		}
-		//请不要修改或删除
-		echo "fail";
-	}
+    public $categoryList;
+
+    //微信支付异步回调
+    public function actionWxCallback()
+    {
+        $postStr = file_get_contents('php://input');//接收微信服务器返回的xml消息体
+        if (empty($postStr)) {
+            util::end();
+        }
+        $postObj = simplexml_load_string($postStr, 'SimpleXMLElement', LIBXML_NOCDATA);
+        if ($postObj->return_code != 'SUCCESS') {
+            Yii::warning('return_code error:' . $postObj->return_code);
+            util::end();
+        }
+        $orderSn = $postObj->out_trade_no;
+        $total_fee = $postObj->total_fee;
+        $totalFee = $total_fee / 100;
+        $attach = $postObj->attach;
+        //接收流水类型、代金劵
+        parse_str($attach);
+        //流水类型
+        $capitalType = isset($capitalType) ? $capitalType : null;
+        if (isset($capitalType) == false) {
+            Yii::warning('capitalType empty,orderSn:' . $orderSn);
+            util::end();
+        }
+
+        $wxPay = dict::getDict('payWay', 'wxPay');
+        //支付成功后续流程
+        $this->_thirdPay($wxPay, $capitalType, $orderSn, $totalFee, $attach);
+
+        echo '<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>';
+    }
+
+    //支付宝异步通知
+    public function actionAliCallback()
+    {
+        header("Content-type: text/html; charset=utf-8");
+        $aliWap = Yii::getAlias("@vendor/alipayWap");
+        //商户订单号
+        $orderSn = $_POST['out_trade_no'];
+
+        $aliPId = '2017041906821571';
+        $aliKey = '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==';
+        $aliPublicKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsz3m9juAR1xew4DY6c34gvbwNg8pZ92f932tseKs+4+pF0e+jTDiUo/xHImNDi1KXt1B+s3LxY9L/sxEksbavwmhgbz/igN1cAEwS2YM+Gnf0csDrxAPJhoKL5FTwxPEQ/8VSgroU+6GlF3LAx4VHa1qfn5MqRPfLroJcyPDyGfNe9vna2FnO4E/PH+hVbvPUAwX3XrUvJIm4OgY0JE3HYFlu+O7F4Ln6+Sl+Zv/ZE2nZAvNiyAwW5iVKhKXLieExqwd0NdrP28baBqkkIY+tmV7butGjB52iK1UbU0+1uiaPL4xBxRy6d0LZmYlvdVHp0JRUuwxBLChGgOCo/76DQIDAQAB';
+
+        $config = [
+            //应用ID,您的APP_ID
+            'app_id' => $aliPId,
+            //商户私钥，您的原始格式RSA私钥
+            'merchant_private_key' => $aliKey,
+            //异步通知地址
+            'notify_url' => Yii::$app->params['ghsHost'] . "/notice/ali-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' => $aliPublicKey,
+        ];
+
+        require_once($aliWap . '/wappay/service/AlipayTradeService.php');
+        require_once($aliWap . '/wappay/buildermodel/AlipayTradeQueryContentBuilder.php');//查询接口
+
+        $arr = $_POST;
+        $aliService = new \AlipayTradeService($config);
+        $aliService->writeLog(var_export($_POST, true));
+        $result = $aliService->check($arr);
+        Yii::info('check:' . $result);
+        if ($result == false) {
+            //请不要修改
+            echo "fail";
+            util::end();
+        }
+
+        //验证成功后续
+        $tradeNo = $_POST['trade_no'];//支付宝交易号
+        $tradeStatus = $_POST['trade_status'];//交易状态
+        $totalFee = $_POST['total_amount'];
+        $appId = $_POST['app_id'];
+        $attach = $_POST['passback_params'];
+        $attach = urldecode($attach);
+        //接收流水类型、代金劵
+        parse_str($attach);
+        //流水类型
+        $capitalType = isset($capitalType) ? $capitalType : null;
+
+        $RequestBuilder = new \AlipayTradeQueryContentBuilder();
+        $RequestBuilder->setTradeNo($tradeNo);
+        //$queryResult = $aliService->Query($RequestBuilder);
+        //$aliId = $queryResult->buyer_user_id;
+        //买家的支付宝帐号，不完整，带*号
+        //$aliAccount = $queryResult->buyer_logon_id;
+
+        if (isset($capitalType) == false) {
+            Yii::warning('capitalType empty, orderSn:' . $orderSn);
+            util::end();
+        }
+        if ($config['app_id'] != $appId) {
+            Yii::warning('app_id disagree, orderSn:' . $orderSn . ' config app_id:' . $config['app_id'] . ' appId:' . $appId);
+            util::end();
+        }
+        if ($tradeStatus == 'TRADE_FINISHED' || $tradeStatus == 'TRADE_SUCCESS') {
+
+            $aliPay = dict::getDict('payWay', 'alipay');
+            //支付成功后续流程
+            $this->_thirdPay($aliPay, $capitalType, $orderSn, $totalFee, $attach);
+
+        }
+        //请不要修改
+        echo "success";
+    }
+
+    public function _thirdPay($payWay, $capitalType, $orderSn, $totalFee, $attach)
+    {
+        //流水类型列表
+        switch ($capitalType) {
+            case dict::getDict('capitalType', 'xhRecharge', 'id'):
+                //充值
+                RechargeClass::thirdPay($payWay, $orderSn, $totalFee, $attach);
+                break;
+            default:
+        }
+    }
 
     /*
      *   {
@@ -151,24 +157,24 @@ class NoticeController extends PublicController
      "update_time": 1511789475 更新时间
   }
      */
-	public function actionExpressCallBack()
-	{
-		$postStr = file_get_contents('php://input');//接收微信服务器返回的json消息体
-        Yii::warning("dada call back params: ". $postStr);
-		if (empty($postStr)) {
-			util::end();
-		}
-		$postData = json_decode($postStr, true);
-		if(empty($postData)){
-		    Yii::warning("dada callback json_decode error");
+    public function actionExpressCallBack()
+    {
+        $postStr = file_get_contents('php://input');//接收微信服务器返回的json消息体
+        Yii::warning("dada call back params: " . $postStr);
+        if (empty($postStr)) {
+            util::end();
+        }
+        $postData = json_decode($postStr, true);
+        if (empty($postData)) {
+            Yii::warning("dada callback json_decode error");
         }
-		//订单号
-		$orderSn = $postData['order_id'];
-		$sign = $postData['signature']; //签名验证？没有
-		//判断订单是否存在
+        //订单号
+        $orderSn = $postData['order_id'];
+        $sign = $postData['signature']; //签名验证？没有
+        //判断订单是否存在
         $orderInfo = OrderClass::getByOrderSn($orderSn);
-        if(!$orderInfo){
-            Yii::warning("dada callback error: 订单不不存在: ".$orderSn);
+        if (!$orderInfo) {
+            Yii::warning("dada callback error: 订单不不存在: " . $orderSn);
             util::end();
         }
         $orderStatus = $postData['order_status'];
@@ -176,7 +182,7 @@ class NoticeController extends PublicController
         $sjId = $orderInfo['merchantId'] ?? 0;
         $sendTime = $orderInfo['sendTime'];
 
-        switch ($orderStatus){
+        switch ($orderStatus) {
             case DadaExpressServices::ORDER_WAIT_ACCEPT:
                 //待接单, 即下单成功： 处理相应的业务逻辑（订单状态变更，消息通知？）
 
@@ -184,13 +190,13 @@ class NoticeController extends PublicController
             case DadaExpressServices::ORDER_WAIT_PICKUP:
                 //待收货 todo
                 //修改骑手姓名，手机号
-                $dmName = $postData['dm_name']??'';
-                $dmMobile = $postData['dm_mobile']??'';
-                OrderExpressClass::pickUp($orderInfo,$dmName,$dmMobile);
+                $dmName = $postData['dm_name'] ?? '';
+                $dmMobile = $postData['dm_mobile'] ?? '';
+                OrderExpressClass::pickUp($orderInfo, $dmName, $dmMobile);
                 break;
             case DadaExpressServices::ORDER_SENDING:
                 //配送中 todo
-                OrderExpressClass::updateExpressStatus($orderSn,OrderExpressClass::STATUS_RECEIVE);
+                OrderExpressClass::updateExpressStatus($orderSn, OrderExpressClass::STATUS_RECEIVE);
                 break;
             case DadaExpressServices::ORDER_COMPLETE:
                 //订单完成 todo
@@ -200,8 +206,8 @@ class NoticeController extends PublicController
                 break;
             case DadaExpressServices::ORDER_CANCEL:
                 //取消 todo
-                $cancel_reason =  $postData['cancel_reason']; //取消理由
-                OrderExpressClass::updateExpressStatus($orderSn,OrderExpressClass::STATUS_CANCEL);
+                $cancel_reason = $postData['cancel_reason']; //取消理由
+                OrderExpressClass::updateExpressStatus($orderSn, OrderExpressClass::STATUS_CANCEL);
                 break;
             case DadaExpressServices::ORDER_WAIT_DISPATCH:
                 //指派单 todo
@@ -219,7 +225,7 @@ class NoticeController extends PublicController
                 break;
             case DadaExpressServices::ORDER_FAIL:
                 //失败 todo
-                OrderExpressClass::updateExpressStatus($orderSn,OrderExpressClass::STATUS_CANCEL);
+                OrderExpressClass::updateExpressStatus($orderSn, OrderExpressClass::STATUS_CANCEL);
                 break;
             default:
 
@@ -227,5 +233,5 @@ class NoticeController extends PublicController
 
         echo "success";
         util::end();
-	}
+    }
 }

app-hd/controllers/NoticeController.php

@@ -3,7 +3,6 @@
 namespace hd\controllers;
 
 use biz\recharge\classes\RechargeClass;
-use bizHd\order\classes\OrderClass;
 use bizHd\purchase\classes\PurchaseClass;
 use common\components\dict;
 use Yii;

biz/sj/classes/SjClass.php

@@ -52,7 +52,7 @@ class SjClass extends BaseClass
             $sjExt->rechargeRenew = 2;
             $sjExt->save();
         } else {
-            util::fail('未知续期方式');
+            util::fail('无效续期方式');
         }
         $log = [
             'event' => $event,