2 Commits 684f2bc639 ... eef2232d27

Author SHA1 Message Date
  jun eef2232d27 Merge branch 'jun' into test 2 weeks ago
  jun 083f91d95d 修改拼团订单 2 weeks ago
1 changed files with 3 additions and 2 deletions
  1. 3 2
      app/Http/Controllers/Api/Orders.php

+ 3 - 2
app/Http/Controllers/Api/Orders.php

@@ -798,7 +798,7 @@ class Orders extends Api{
         }
         $orderInfo = [
             'custom_uid'		    => $uid,
-            'status'		        => 10,
+            'status'                => $isPay ? 0 : 10,
             'insert_time'		    => $time,
             'update_time'		    => $time,
             'pay_total'		        => $payTotal,
@@ -820,7 +820,7 @@ class Orders extends Api{
             'business_id'		    => $productList[$buyInfo['product_id']]['business_id'],
             'insert_time'		    => $time,
             'update_time'		    => $time,
-            'status'		        => 10,
+            'status'                => $isPay ? 0 : 10,
         ];
         // 组合数据,写入订单表,子表
         DB::beginTransaction();
@@ -860,6 +860,7 @@ class Orders extends Api{
                 }
             }
             $orderInfo['regiment_id']   = $regimentId;
+            $orderInfo['is_pay']        = $isPay;
             // 创建总订单
             $orderId				= $Model->add($orderInfo);
             // 如果订单写入失败