Sfoglia il codice sorgente

确认下单返回支付票据数据

family 1 anno fa
parent
commit
21f4e03f05
1 ha cambiato i file con 10 aggiunte e 5 eliminazioni
  1. 10 5
      app/common/repositories/movie/MovieRepository.php

+ 10 - 5
app/common/repositories/movie/MovieRepository.php

@@ -203,6 +203,7 @@ class MovieRepository extends BaseRepository
203
             $_order = [
203
             $_order = [
204
                 'uid' => $userinfo->uid,
204
                 'uid' => $userinfo->uid,
205
                 'mobile' => $params['phone'] ?? $userinfo->phone,
205
                 'mobile' => $params['phone'] ?? $userinfo->phone,
206
+                'phone' => $params['phone'] ?? $userinfo->phone,
206
                 'order_sn' => $order_sn,
207
                 'order_sn' => $order_sn,
207
                 'plat_order' => $submitOrder['data']['plat_order'],
208
                 'plat_order' => $submitOrder['data']['plat_order'],
208
                 'price' => $order_price,
209
                 'price' => $order_price,
@@ -236,7 +237,7 @@ class MovieRepository extends BaseRepository
236
             });
237
             });
237
             return $order_sn;
238
             return $order_sn;
238
         } else {
239
         } else {
239
-            throw new ValidateException('锁座下单失败');
240
+            throw new ValidateException($submitOrder['msg']);
240
         }
241
         }
241
     }
242
     }
242
 
243
 
@@ -268,7 +269,7 @@ class MovieRepository extends BaseRepository
268
             $orderinfo->update_time = time();
269
             $orderinfo->update_time = time();
269
             $orderinfo->save();
270
             $orderinfo->save();
270
 
271
 
271
-            return app('json')->success($res);
272
+            return $res;
272
         }
273
         }
273
         throw new ValidateException('支付失败');
274
         throw new ValidateException('支付失败');
274
     }
275
     }
@@ -316,7 +317,7 @@ class MovieRepository extends BaseRepository
316
                         'device_ip' => app('request')->ip()
317
                         'device_ip' => app('request')->ip()
317
                     ],
318
                     ],
318
                     'expend' => json_encode(['open_id' => $openid, 'wx_app_id' => $appid]),
319
                     'expend' => json_encode(['open_id' => $openid, 'wx_app_id' => $appid]),
319
-                    'fee_mode' => 'I',
320
+//                    'fee_mode' => 'I',
320
                     'notify_url' => $notify_url,
321
                     'notify_url' => $notify_url,
321
                     'pay_mode' => $pay_mode
322
                     'pay_mode' => $pay_mode
322
                 ];
323
                 ];
@@ -338,7 +339,7 @@ class MovieRepository extends BaseRepository
338
                     'device_info' => [
339
                     'device_info' => [
339
                         'device_ip' => app('request')->ip()
340
                         'device_ip' => app('request')->ip()
340
                     ],
341
                     ],
341
-                    'fee_mode' => 'I',
342
+//                    'fee_mode' => 'I',
342
                     'notify_url' => $notify_url
343
                     'notify_url' => $notify_url
343
                 ];
344
                 ];
344
                 break;
345
                 break;
@@ -366,7 +367,7 @@ class MovieRepository extends BaseRepository
366
             $plat_orderinfo['order_price'] = $orderinfo['order_price'];
367
             $plat_orderinfo['order_price'] = $orderinfo['order_price'];
367
             $plat_orderinfo['order_sn'] = $order_sn;
368
             $plat_orderinfo['order_sn'] = $order_sn;
368
             $plat_orderinfo['create_time'] = strtotime($orderinfo['create_time']);
369
             $plat_orderinfo['create_time'] = strtotime($orderinfo['create_time']);
369
-            $plat_orderinfo['phone'] = $orderinfo['phone'];
370
+            $plat_orderinfo['phone'] = $orderinfo['mobile'];
370
             $plat_orderinfo['sched_seat'] = json_decode($orderinfo['sched_seat'], true);
371
             $plat_orderinfo['sched_seat'] = json_decode($orderinfo['sched_seat'], true);
371
             $plat_orderinfo['cinema'] = [
372
             $plat_orderinfo['cinema'] = [
372
                 'cinema_sign' => $orderinfo['cinema_sign'],
373
                 'cinema_sign' => $orderinfo['cinema_sign'],
@@ -388,6 +389,10 @@ class MovieRepository extends BaseRepository
388
             ];
389
             ];
389
             $plat_orderinfo['sched_time'] = date('Y-m-d H:i', strtotime($result['data']['sched_time']));
390
             $plat_orderinfo['sched_time'] = date('Y-m-d H:i', strtotime($result['data']['sched_time']));
390
             $plat_orderinfo['schedend_time'] = date('m-d H:i', strtotime($result['data']['sched_time']) + $film['duration'] * 60);
391
             $plat_orderinfo['schedend_time'] = date('m-d H:i', strtotime($result['data']['sched_time']) + $film['duration'] * 60);
392
+            if ($plat_orderinfo['status'] == 1) {
393
+                $plat_orderinfo['status'] = 0;
394
+                $plat_orderinfo['state'] = '待付款';
395
+            }
391
 
396
 
392
             unset($plat_orderinfo['plat_order']);
397
             unset($plat_orderinfo['plat_order']);
393
             unset($plat_orderinfo['third_order']);
398
             unset($plat_orderinfo['third_order']);