root %!s(int64=7) %!d(string=hai) anos
pai
achega
d79b75b845

+ 10 - 2
app/Http/Controllers/PaymentController.php

@@ -38,6 +38,7 @@ class PaymentController extends Controller
     {
         $goods_id = intval($request->get('goods_id'));
         $coupon_sn = $request->get('coupon_sn');
+        $pay_type = $request->get('pay_type');
 
         $goods = Goods::query()->where('is_del', 0)->where('status', 1)->where('id', $goods_id)->first();
         if (!$goods) {
@@ -146,7 +147,12 @@ class PaymentController extends Controller
                 }
             }else if(self::$systemConfig['is_trimepay']){
                 $trimepay = new Trimepay(self::$systemConfig['trimepay_appid'], self::$systemConfig['trimepay_appsecret']);
-                $result = $trimepay->pay('WEPAY_QR', $orderSn, $amount, self::$systemConfig['website_url'].'/api/trimepay', self::$systemConfig['website_url']);
+                if($pay_type==1){
+                    $payMethod='ALIPAY_QR';
+                }else if($pay_type==2){
+                    $payMethod='WEPAY_QR';
+                }
+                $result = $trimepay->pay($payMethod, $orderSn, $amount, self::$systemConfig['website_url'].'/api/trimepay', self::$systemConfig['website_url']);
                 if ($result['code']!==0) {
                     Log::error('【Trimepay】创建二维码失败:' . $result['msg']);
 
@@ -185,7 +191,9 @@ class PaymentController extends Controller
             }
 
             DB::commit();
-
+            if(self::$systemConfig['is_trimepay']){
+                
+            }
             return Response::json(['status' => 'success', 'data' => $sn, 'message' => '创建订单成功,正在转到付款页面,请稍后']);
         } catch (\Exception $e) {
             DB::rollBack();

+ 5 - 5
resources/views/user/buy.blade.php

@@ -76,9 +76,10 @@
             <div class="row">
                 <div class="col-xs-12" style="text-align: right;">
                     @if($is_youzan)
-                        <a class="btn btn-lg red hidden-print" onclick="onlinePay()"> {{trans('home.online_pay')}} </a>
+                        <a class="btn btn-lg red hidden-print" onclick="onlinePay(0)"> {{trans('home.online_pay')}} </a>
                     @elseif($is_trimepay)
-                        <a class="btn btn-lg red hidden-print" onclick="onlinePay()"> {{trans('home.online_pay')}} </a>
+                        <a class="btn btn-lg blue hidden-print" onclick="onlinePay(1)"> 支付宝扫码 </a>
+                        <a class="btn btn-lg green hidden-print" onclick="onlinePay(2)"> 微信扫码 </a>
                     @endif
                   	@if($goods->type <= 2)
                         <a class="btn btn-lg blue hidden-print uppercase" onclick="pay()"> {{trans('home.service_pay_button')}} </a>
@@ -139,10 +140,9 @@
         }
 
         // 在线支付
-        function onlinePay() {
+        function onlinePay(pay_type) {
             var goods_id = '{{$goods->id}}';
             var coupon_sn = $('#coupon_sn').val();
-
             index = layer.load(1, {
                 shade: [0.7,'#CCC']
             });
@@ -151,7 +151,7 @@
                 type: "POST",
                 url: "{{url('payment/create')}}",
                 async: false,
-                data: {_token:'{{csrf_token()}}', goods_id:goods_id, coupon_sn:coupon_sn},
+                data: {_token:'{{csrf_token()}}', goods_id:goods_id, coupon_sn:coupon_sn, pay_type},
                 dataType: 'json',
                 beforeSend: function () {
                     index = layer.load(1, {