Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Services/CartService.php

@@ -63,21 +63,23 @@ class CartService
 
 
             $temp["buy_price"] = $buy_price;
             $temp["buy_price"] = $buy_price;
             $checkHas = CartModel::where(["user_id"=>$user_id,"goods_id"=>$goods_id,"status"=>1])->first();
             $checkHas = CartModel::where(["user_id"=>$user_id,"goods_id"=>$goods_id,"status"=>1])->first();
+            if ($buy_number < \Arr::get($skuInfo,"moq") || $buy_number > $skuInfo["stock"]  ){
+                 return false;
+            }
 
 
-            if ($checkHas){
-                $buy_number = $buy_number+$checkHas["buy_number"];
+            $temp["buy_number"] = $buy_number;
 
 
+            if ($checkHas){
                 $cart_id = $checkHas["cart_id"];
                 $cart_id = $checkHas["cart_id"];
                 $temp["update_time"] = time();
                 $temp["update_time"] = time();
                 $temp["status"] = $buy_number > 0 ? CartModel::status_yes:CartModel::status_no;
                 $temp["status"] = $buy_number > 0 ? CartModel::status_yes:CartModel::status_no;
-                $temp["buy_number"] = $skuInfo["stock"] > $buy_number ? $buy_number : $skuInfo["stock"];
+
 
 
                 $flag = CartModel::where(["cart_id"=>$checkHas["cart_id"]])->update($temp);
                 $flag = CartModel::where(["cart_id"=>$checkHas["cart_id"]])->update($temp);
                 if (!$flag){
                 if (!$flag){
                     return false;
                     return false;
                 }
                 }
             }else{ //不存在插入购物车
             }else{ //不存在插入购物车
-                $temp["buy_number"] = $skuInfo["stock"] > $buy_number ? $buy_number : $skuInfo["stock"];
                 $temp["status"] = $buy_number > 0 ? CartModel::status_yes:CartModel::status_no;
                 $temp["status"] = $buy_number > 0 ? CartModel::status_yes:CartModel::status_no;
                 $temp["create_time"] = time();
                 $temp["create_time"] = time();
                 $temp["update_time"] = time();
                 $temp["update_time"] = time();