调整支付

normandcrm/service/common/pay/PayForm.php

@@ -175,12 +175,19 @@ class PayForm extends Model
     public function handleNotify($data)
     {
         $payType = isset($data['payType']) ? trim($data['payType']) : '';
+
+        if($data['payType']=="wy_bb" || $data['payType']=="alipay_bb"){
+            $handler = BasePayHandler::getPayHandlerByPayType(19);
+        }else{
+            $handler = BasePayHandler::getPayHandlerByPayType($payType);
+            unset($data['payType']);
+        }
         unset($data['token']);
-        unset($data['payType']);
-        $handler = BasePayHandler::getPayHandlerByPayType($payType);
         $success = false;
         if ($handler != null) {
+            file_put_contents('huiqidata.txt',\GuzzleHttp\json_encode($data));
             $success = $handler->handleNotify($data);
+            file_put_contents('huiqi7.txt',$success);
             $this->_outNotifyResult = $handler->outNotify($success);
         }
         return $success;

normandcrm/service/common/pay/payplat/PayHandler.php

@@ -74,7 +74,7 @@ class PayHandler extends BasePayHandler
             if (PayUtils::checkSign($data)) {
                     file_put_contents('payplat_success.txt','验签成功');
                     if($data['payStatus'] == '1'){
-                        $merOrderId = trim($data['orderNo']);
+                        $merOrderId = trim($data['sdOrderNo']);
                         $reuslt = Deposit::find()->where(['order_sn' => $merOrderId])->asArray()->limit(1)->one();
                         if ($reuslt['type'] != 1) {
                             $res = Deposit::updateAll(['type' => 1], "order_sn = $merOrderId");
@@ -105,7 +105,7 @@ class PayHandler extends BasePayHandler
     public function outNotify($success)
     {
         if ($success == true) {
-            return success;
+            return 'success';
         } else {
 			// 返回的数据格式
             return "FAIL";
@@ -123,7 +123,7 @@ class PayHandler extends BasePayHandler
             $data['secret'] = $this->Key;
             if (PayUtils::checkSign($data)) {
                 if ($data['payStatus'] == '1') {
-                    $merOrderId = trim($data['orderNo']);
+                    $merOrderId = trim($data['sdOrderNo']);
                     $reuslt = Deposit::find()->where(['order_sn' => $merOrderId])->asArray()->limit(1)->one();
                     if ($reuslt) {
                         return true;