shish 2 ani în urmă
părinte
comite
aeffa81e6a

+ 0 - 19
app-ghs/controllers/TestController.php

@@ -29,8 +29,6 @@ class TestController extends BaseController
 
     public function actionAliRun()
     {
-//        $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/cs_private_key.pem';
-//        $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/cs_cert.cer';
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/api_cert.cer';
         $params = [
@@ -45,7 +43,6 @@ class TestController extends BaseController
         $outTradeNo = orderSn::getPurchaseSn();
         $price = 0.1;
         $response = $laResource->driveAliPay($outTradeNo, $price);
-        print_r($response);die;
         if ($response && isset($response['cmdRetCode']) && $response['cmdRetCode'] == 'GLOBAL_SUCCESS') {
             echo '<pre>';
             echo "下单成功<br/>";
@@ -59,8 +56,6 @@ class TestController extends BaseController
 
     public function actionAliRun2()
     {
-//        $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/cs_private_key.pem';
-//        $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/cs_cert.cer';
         $merchantPrivateKeyPath = Yii::getAlias("@vendor/lakala") . '/production/api_private_key.pem';
         $lklCertificatePath = Yii::getAlias("@vendor/lakala") . '/production/api_cert.cer';
         $params = [
@@ -86,20 +81,6 @@ class TestController extends BaseController
         }
     }
 
-
-    public function actionIndex()
-    {
-        //header('Content-type:image/png');
-        $productId = 1;
-        $barcode = barcodeUtil::barcodeGeneratorPNG($productId);
-        oss::uploadContent("ghs/barcode/" . $productId . '.png', $barcode);
-        $barcode = base64_encode($barcode);
-        echo ' <img src="data:image/png;base64,' . $barcode . '"/>';
-//        $merchantExtend = WxOpenClass::getGhsWxInfo();
-//       // $res = baiduAip::transfer("你好");
-//        dd($merchantExtend);
-    }
-
     //dada 城市code
     public function actionDadaCityCode()
     {

+ 2 - 3
app-hd/controllers/NoticeController.php

@@ -27,11 +27,10 @@ class NoticeController extends PublicController
     public function actionPayCallback()
     {
         $headers = Yii::$app->getRequest()->getHeaders();
-        $host = $headers->get('host');
-        echo $host;
+        $Authorization = $headers->get('Authorization');
+        noticeUtil::push($Authorization, '15280215347');
     }
 
-
     //微信支付异步回调
     public function actionWxCallback()
     {

+ 4 - 2
common/components/lakala/Lakala.php

@@ -34,6 +34,7 @@ class Lakala
     //主扫交易,支付宝
     public function driveWxPay($orderSn, $amount)
     {
+        $notifyUrl = Yii::$app->params['hdHost'] . "/notice/pay-callback";
         $location_info = ['request_ip' => $_SERVER['SERVER_ADDR']];
         $arr = [
             'merchant_no' => $this->merchant_no,
@@ -44,7 +45,7 @@ class Lakala
             'total_amount' => $amount * 100,
             'location_info' => $location_info,
             'subject' => '购买花材',
-            'notify_url' => '',
+            'notify_url' => $notifyUrl,
             'remark' => '',
         ];
         $baseRequestVO = [
@@ -60,6 +61,7 @@ class Lakala
     //主扫交易,支付宝
     public function driveAliPay($orderSn, $amount)
     {
+        $notifyUrl = Yii::$app->params['hdHost'] . "/notice/pay-callback";
         $location_info = ['request_ip' => $_SERVER['SERVER_ADDR']];
         $arr = [
             'merchant_no' => $this->merchant_no,
@@ -70,7 +72,7 @@ class Lakala
             'total_amount' => $amount * 100,
             'location_info' => $location_info,
             'subject' => '购买花材',
-            'notify_url' => '',
+            'notify_url' => $notifyUrl,
             'remark' => '',
         ];
         $baseRequestVO = [