lizhen пре 2 дана
родитељ
комит
90c914dca5
2 измењених фајлова са 10 додато и 13 уклоњено
  1. 10 2
      addons/unishop/model/Order.php
  2. 0 11
      application/api/controller/Unishop.php

+ 10 - 2
addons/unishop/model/Order.php

@@ -270,7 +270,7 @@ class Order extends Model
             'alipay' => 4,
         ];
 
-        $this->save([
+        $order_data = [
             'user_id' => $userId,
             'out_trade_no' => $out_trade_no,
             'order_price' => $orderPrice,
@@ -287,7 +287,14 @@ class Order extends Model
             'book_mobile' => $data['book_mobile'] ?? '',
 
 
-        ]);
+        ];
+        //零元订单
+        if($totalPrice == 0){
+            $order_data['have_paid'] = time();
+            //自动发货
+            $order_data['have_delivered'] = time();
+        }
+        $this->save($order_data);
 
         $id = $this->id;
 
@@ -334,6 +341,7 @@ class Order extends Model
         Hook::listen('create_order_after', $products, $data);
 
         return [
+            'need_pay' => $totalPrice == 0 ? 0 : 1, //零元不需要支付
             'order_id' => $id,
             'out_trade_no' => $out_trade_no
         ];

+ 0 - 11
application/api/controller/Unishop.php

@@ -49,17 +49,6 @@ class Unishop extends Api
             $this->error('请刷新重试');
         }
 
-        if($orderinfo['total_price'] == 0){
-            $update = [
-                'have_paid'=>time(),
-                //自动发货
-                'have_delivered' => time()
-            ];
-            Db::name('unishop_order')->where($map)->update($update);
-            $this->error('零元订单,已支付成功');
-        }
-
-
         //创建订单
         $data = [];
         $data['user_id'] = $uid;