Browse Source

修改代码

fuyu 6 years ago
parent
commit
49b642012a
1 changed files with 8 additions and 4 deletions
  1. 8 4
      application/inter/controller/Application.php

+ 8 - 4
application/inter/controller/Application.php

@@ -476,8 +476,10 @@ class Application extends Base
             ->field('id')
             ->field('id')
             ->find();
             ->find();
             if($remote_order) {
             if($remote_order) {
-                DB::rollback();
-                return json_encode(['status'=>'fail','code'=>'2019','已存在订单,请勿重复发起']);
+                DB::commit();
+                return true;
+                // DB::rollback();
+                // return json_encode(['status'=>'fail','code'=>'2019','已存在订单,请勿重复发起']);
             }
             }
             DB::table('remote_order')->insert([
             DB::table('remote_order')->insert([
                 'id' => $order_id,
                 'id' => $order_id,
@@ -522,8 +524,10 @@ class Application extends Base
             ->field('id')
             ->field('id')
             ->find();
             ->find();
             if($remote_order) {
             if($remote_order) {
-                DB::rollback();
-                return json_encode(['status'=>'fail','code'=>'2019','已存在订单,请勿重复发起']);
+                DB::commit();
+                return true;
+                // DB::rollback();
+                // return json_encode(['status'=>'fail','code'=>'2019','已存在订单,请勿重复发起']);
             }
             }
             $order_id = UUIDs::uuid16();
             $order_id = UUIDs::uuid16();
             DB::table('remote_order')->insert([
             DB::table('remote_order')->insert([