rabin 6 months ago
parent
commit
d26b453253

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

@@ -38,6 +38,7 @@ class Price
                 }
             }
         }
+        $result['original'] = $result['original'] * $result['num'];
         $result['value'] = $result['value'] * $result['num'];
         $result['text'] = $this->getText($result['value'], $type);
         return $result;

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

@@ -110,6 +110,9 @@ class Resource
                     $detail['name'] = $v['name'];
                     $detail['pic'] = $v['pic'];
                     Dever::db('order_detail', 'place')->insert($detail);
+                    if (isset($v['cart_id']) && $v['cart_id']) {
+                        Dever::db('cart', 'goods')->delete(array('id' => $v['cart_id'], 'uid' => Place::$uid));
+                    }
                 }
             }
         }

+ 9 - 5
src/resource/goods/lib/Cart.php

@@ -15,12 +15,14 @@ class Cart
         if ($data) {
             $resource = new Resource($this->type);
             foreach($data as &$v) {
-                Dever::input('price_id', 'set', $v['sku_id']);
+                Dever::input('num', 'set', $v['num']);
+                Dever::input('sku_id', 'set', $v['sku_id']);
                 $info = $resource->getInfo($v['info_id'], false);
                 if (!$info) {
                     $v['del'] = 1;
                 } else {
                     $v['del'] = 2;
+                    unset($info['price']['list']);
                 }
                 $v['name'] = $info['name'];
                 $v['pic'] = $info['pic'];
@@ -48,6 +50,7 @@ class Cart
             }
         } else {
             $data['num'] = $num;
+            $data['status'] = 1;
             Dever::db('cart', 'goods')->insert($data);
         }
         return $this->getList();
@@ -102,7 +105,8 @@ class Cart
                 $id = $v['id'];
                 $num = $v['num'];
                 $sku_id = $v['sku_id'];
-                Dever::input('price_id', 'set', $sku_id);
+                Dever::input('num', 'set', $num);
+                Dever::input('sku_id', 'set', $sku_id);
                 $info = $resource->getInfo($v['info_id'], false);
                 if ($info) {
                     $v = $info;
@@ -110,9 +114,9 @@ class Cart
                     $v['sku_id'] = $sku_id;
                     $v['num'] = $num;
                     $v['cash'] = $v['price']['value'];
-                    $result['value'] += $num;
-                    $result['value'] += $v['cash'] * $num;
-                    $result['original'] += $v['price']['original']*$num;
+                    $result['num'] += $v['price']['num'];
+                    $result['value'] += $v['cash'];
+                    $result['original'] += $v['price']['original'];
                     $v['name'] = $v['name'];
                     if (isset($v['sku']['info']['name'])) {
                         $v['sku_name'] = $v['sku']['info']['name'];

+ 1 - 1
src/resource/goods/lib/Info.php

@@ -44,7 +44,7 @@ class Info
                 if (!$detail['pic']) {
                     $detail['pic'] = $info['pic'][0];
                 }
-                $detail['cash'] = $result['sku']['info']['value'];
+                $detail['cash'] = $result['value'];
                 $detail['sku_id'] = $detail['id'];
                 $detail['sku_name'] = $detail['name'];
                 $detail['id'] = $result['id'];