lizhen_gitee 10 months ago
parent
commit
abb050dfd3
2 changed files with 9 additions and 4 deletions
  1. 8 4
      addons/unishop/controller/Order.php
  2. 1 0
      addons/unishop/model/Order.php

+ 8 - 4
addons/unishop/controller/Order.php

@@ -104,10 +104,8 @@ class Order extends Base
                 /** 产品基础数据 **/
                 $spec = input('spec', '');
 
-                $productData = [];
-                for($i=1;$i<=$number;$i++){
-                    $productData[] = $product->getDataOnCreateOrder($spec);
-                }
+                $productData[0] = $product->getDataOnCreateOrder($spec,$number);
+
             } else {
                 // 多个商品
                 $cart = input('cart');
@@ -214,6 +212,12 @@ class Order extends Base
     {
         $data = input();
         $data['city_id'] = 2;
+
+        $pay_type = input('pay_type','alipay');
+        if(!in_array($pay_type,['wechat','alipay','wallet'])){
+            $this->error();
+        }
+
         try {
             $validate = Loader::validate('\\addons\\unishop\\validate\\Order');
             if (!$validate->check($data, [], 'submit')) {

+ 1 - 0
addons/unishop/model/Order.php

@@ -251,6 +251,7 @@ class Order extends Model
             'discount_price' => $discountPrice,
             'delivery_price' => $deliveryPrice,
             'total_price' => $totalPrice,
+            'pay_type' => $data['pay_type'],
             'ip' => $_SERVER['REMOTE_ADDR'] ?? '',
             'remark' => $data['remark'] ?? '',
             'status' => self::STATUS_NORMAL,