Kirin il y a 2 ans
Parent
commit
7f377217cc
1 fichiers modifiés avec 44 ajouts et 21 suppressions
  1. 44 21
      application/api/controller/Wechat.php

+ 44 - 21
application/api/controller/Wechat.php

@@ -42,8 +42,8 @@ class Wechat extends Frontend
         }
 
         $params = [
-          //  'amount' => $order->rmb_amount,
-          'amount' => $order->coin_price,
+            //  'amount' => $order->rmb_amount,
+            'amount' => $order->coin_price,
             'orderid' => $order->out_trade_no,
             'type' => "wxpay",
             'title' => $order->box_name,
@@ -60,9 +60,9 @@ class Wechat extends Frontend
 
 
 //echo 222;
-echo \addons\eepay\Service::pay($params);
+        echo \addons\eepay\Service::pay($params);
 
-      //  echo \addons\epay\library\Service::submitOrder($params);
+        //  echo \addons\epay\library\Service::submitOrder($params);
     }
 
     /**
@@ -82,15 +82,15 @@ echo \addons\eepay\Service::pay($params);
         }
 
         $data = [
-            'amount'    => $order['rmb_amount'],
-            'orderid'   => $order['out_trade_no'],
-            'type'      => '',
-            'title'     => '',
+            'amount' => $order['rmb_amount'],
+            'orderid' => $order['out_trade_no'],
+            'type' => '',
+            'title' => '',
             'notifyurl' => $this->request->domain() . '/addons/epay/api/notifyx2',
-            'returnurl' => $this->request->domain() .'/addons/epay/api/returnx2222222',
-            'method'    => 'miniapp',
+            'returnurl' => $this->request->domain() . '/addons/epay/api/returnx2222222',
+            'method' => 'miniapp',
             'body' => '充值',
-            'openid'    => \app\common\model\User::where('id', $order['user_id'])->value('openid'),
+            'openid' => \app\common\model\User::where('id', $order['user_id'])->value('openid'),
         ];
 
 
@@ -121,22 +121,45 @@ echo \addons\eepay\Service::pay($params);
         $params = [
             'amount' => $order->rmb_amount,
             'orderid' => $order->out_trade_no,
-            'type' => "wxpay",
-            'title' => '快递费用',
+            'type' => "",
+            'title' => '',
             'notifyurl' => $this->request->domain() . '/api/alipay/notifyx/orderfrom/delivery',
             'returnurl' => $this->request->domain() . '/api/alipay/deliverypaysuccess',
-            'method' => "wap",
+            'method' => "miniapp",
+            'body' => '快递费用',
+            'openid' => \app\common\model\User::where('id', $order['user_id'])->value('openid'),
         ];
 
-        $query = input('get.');
-        if (isset($query['orderid'])) {
-            unset($query['orderid']);
-        }
-        $this->auth->redis->set($order->out_trade_no, $query, 60 * 30); // 将参数存入缓存,30分钟
 
-    //    echo \addons\epay\library\Service::submitOrder($params);
-    echo \addons\eepay\Service::payfh($params);
+//        $data = [
+//            'amount'    => $order['rmb_amount'],
+//            'orderid'   => $order['out_trade_no'],
+//            'type'      => '',
+//            'title'     => '',
+//            'notifyurl' => $this->request->domain() . '/addons/epay/api/notifyx2',
+//            'returnurl' => $this->request->domain() .'/addons/epay/api/returnx2222222',
+//            'method'    => 'miniapp',
+//            'body' => '充值',
+//            'openid'    => \app\common\model\User::where('id', $order['user_id'])->value('openid'),
+//        ];
+
 
+        $res = Service::submitOrder($params);
+        $data = [
+            'msg' => '微信支付',
+            'jsConfig' => $res
+        ];
+
+
+//        $query = input('get.');
+//        if (isset($query['orderid'])) {
+//            unset($query['orderid']);
+//        }
+//        $this->auth->redis->set($order->out_trade_no, $query, 60 * 30); // 将参数存入缓存,30分钟
+//
+//    //    echo \addons\epay\library\Service::submitOrder($params);
+//    echo \addons\eepay\Service::payfh($params);
+        return json_encode($data);
     }
 
     /**