rabin 6 months ago
parent
commit
c8e74dbcdb

+ 3 - 1
src/place/api/Cart.php

@@ -2,6 +2,7 @@
 use Dever;
 use Place;
 use Place\Lib\Main;
+use Place\Lib\Resource;
 class Cart extends Main
 {
     protected $login = true;
@@ -56,6 +57,7 @@ class Cart extends Main
     public function pay()
     {
         $info = $this->confirm();
-        return Dever::load('order', 'place')->pay($info, 3, 'goods');
+        $resource = new Resource(3);
+        return $resource->pay($info);
     }
 }

+ 1 - 1
src/place/api/Order.php

@@ -22,6 +22,6 @@ class Order extends Main
     # 查看订单详情
     public function detail()
     {
-        
+
     }
 }

+ 3 - 0
src/place/lib/Price.php

@@ -5,12 +5,14 @@ class Price
 {
     public function get($info, $app, $type, $button)
     {
+        $num = Dever::input('num', 'is_numeric', '数量', 1);
         $result = array();
         $result['status'] = 1;
         $result['text'] = '';
         $result['original'] = $info['price'];
         $result['value'] = $info['price'];
         $result['button'] = $button;
+        $result['num'] = $num;
         $result['list'] = array();
         $order = Dever::db('order', 'place')->find(array('type' => $type, 'type_id' => $info['id'], 'uid' => Place::$uid, 'status' => 5));
         if ($order) {
@@ -36,6 +38,7 @@ class Price
                 }
             }
         }
+        $result['value'] = $result['value'] * $result['num'];
         $result['text'] = $this->getText($result['value'], $type);
         return $result;
     }

+ 2 - 1
src/place/lib/Resource.php

@@ -90,6 +90,7 @@ class Resource
             $order['status'] = 1;
             $order['type'] = $this->type;
             $order['type_id'] = $info['id'];
+            $order['num'] = $info['num'];
             $data['order_id'] = Dever::db('order', 'place')->insert($order);
             $data['order_num'] = $order['order_num'];
             if (isset($info['detail'])) {
@@ -105,7 +106,7 @@ class Resource
                     }
                     $detail['pic'] = $v['pic'];
                     $detail['cash'] = $v['cash'];
-                    $detail['num'] = $v['num'];
+                    $detail['num'] = $v['num'] ?? $order['num'];
                     $detail['name'] = $v['name'];
                     $detail['pic'] = $v['pic'];
                     Dever::db('order_detail', 'place')->insert($detail);

+ 4 - 2
src/resource/goods/lib/Cart.php

@@ -96,6 +96,7 @@ class Cart
             $result['text'] = '';
             $result['id'] = '';
             $result['name'] = '';
+            $result['num'] = 0;
             $resource = new Resource($this->type);
             foreach($data as &$v) {
                 $id = $v['id'];
@@ -109,8 +110,9 @@ class Cart
                     $v['sku_id'] = $sku_id;
                     $v['num'] = $num;
                     $v['cash'] = $v['price']['value'];
-                    $result['value'] += $v['cash'];
-                    $result['original'] += $v['price']['original'];
+                    $result['value'] += $num;
+                    $result['value'] += $v['cash'] * $num;
+                    $result['original'] += $v['price']['original']*$num;
                     $v['name'] = $v['name'];
                     if (isset($v['sku']['info']['name'])) {
                         $v['sku_name'] = $v['sku']['info']['name'];

+ 0 - 2
src/resource/goods/lib/Info.php

@@ -31,7 +31,6 @@ class Info
     public function submit($info, $type = 'price')
     {
         $sku_id = Dever::input('sku_id', 'is_numeric', '价格');
-        $sku_num = Dever::input('sku_num', 'is_numeric', '数量', 1);
         $result = $info[$type];
         $result['id'] = $info['id'];
         $result['name'] = $info['name'];
@@ -45,7 +44,6 @@ class Info
                 if (!$detail['pic']) {
                     $detail['pic'] = $info['pic'][0];
                 }
-                $detail['num'] = $sku_num;
                 $detail['cash'] = $result['sku']['info']['value'];
                 $detail['sku_id'] = $detail['id'];
                 $detail['sku_name'] = $detail['name'];