merged

app/Console/Commands/AutoJob.php

@@ -277,7 +277,7 @@ class AutoJob extends Command
          * 当有赞没有正常推送消息或者其他原因导致用户已付款但是订单不生效从而导致用户无法正常加流量、置状态
          * 故需要每分钟请求一次未支付订单，审计一下其支付状态
          */
-        $paymentList = Payment::query()->with(['order', 'user'])->where('status', 0)->get();
+        $paymentList = Payment::query()->with(['order', 'user'])->where('status', 0)->where('qr_id', '>', 0)->get();
         if (!$paymentList->isEmpty()) {
             foreach ($paymentList as $payment) {
                 // 跳过order丢失的订单
@@ -463,7 +463,7 @@ class AutoJob extends Command
                             $content['serverList'] = $nodeList;
 
                             try {
-                                Mail::to($order->email)->send(new sendUserInfo(self::$systemConfig['website_name'], $content));
+                                Mail::to($order->email)->send(new sendUserInfo($content));
                                 Helpers::addEmailLog($order->email, $title, json_encode($content));
                             } catch (\Exception $e) {
                                 Helpers::addEmailLog($order->email, $title, json_encode($content), 0, $e->getMessage());

app/Http/Controllers/PaymentController.php

@@ -151,14 +151,14 @@ class PaymentController extends Controller
             } else if (self::$systemConfig['is_trimepay']) {
                 $trimepay = new Trimepay(self::$systemConfig['trimepay_appid'], self::$systemConfig['trimepay_appsecret']);
 
-                if($pay_type==1){
-                    $payMethod='ALIPAY_QR';
-                }else if($pay_type==2){
-                    $payMethod='WEPAY_QR';
+                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) {
+                $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']);
 
                     throw new \Exception($result['msg']);
@@ -196,9 +196,7 @@ class PaymentController extends Controller
             }
 
             DB::commit();
-            if(self::$systemConfig['is_trimepay']){
-                
-            }
+
             return Response::json(['status' => 'success', 'data' => $sn, 'message' => '创建订单成功，正在转到付款页面，请稍后']);
         } catch (\Exception $e) {
             DB::rollBack();

resources/views/payment/detail.blade.php

@@ -28,11 +28,11 @@
                                 </tr>
                                 <tr>
                                     <td colspan="2">
-                                        扫描下方二维码进行付款（可截图再扫描）
+                                        扫描下方二维码进行付款
                                         <br>
                                         请于15分钟内支付，到期未支付订单将自动关闭
                                         <br>
-                                        支付后，请稍作等待，账号状态会自动更新
+                                        支付后请稍作等待，系统将自动处理
                                     </td>
                                 </tr>
                                 <tr>

resources/views/user/buy.blade.php

@@ -78,7 +78,7 @@
                     @if($is_youzan)
                         <a class="btn btn-lg red hidden-print" onclick="onlinePay(0)"> {{trans('home.online_pay')}} </a>
                     @elseif($is_trimepay)
-                        <a class="btn btn-lg blue hidden-print" onclick="onlinePay(1)"> 支付宝扫码 </a>
+                        <a class="btn btn-lg green hidden-print" onclick="onlinePay(1)"> 支付宝扫码 </a>
                         <a class="btn btn-lg green hidden-print" onclick="onlinePay(2)"> 微信扫码 </a>
                     @endif
                   	@if($goods->type <= 2)
@@ -143,6 +143,7 @@
         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 +152,7 @@
                 type: "POST",
                 url: "{{url('payment/create')}}",
                 async: false,
-                data: {_token:'{{csrf_token()}}', goods_id:goods_id, coupon_sn:coupon_sn, pay_type},
+                data: {_token:'{{csrf_token()}}', goods_id:goods_id, coupon_sn:coupon_sn, pay_type:pay_type},
                 dataType: 'json',
                 beforeSend: function () {
                     index = layer.load(1, {