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

@@ -207,7 +207,7 @@ class CartService
         if ($user_id){
         if ($user_id){
             $where["user_id"] = $user_id;
             $where["user_id"] = $user_id;
         }
         }
-        if ($gid){
+        if (!$user_id && $gid){
             $where["gid"] = $gid;
             $where["gid"] = $gid;
         }
         }
 
 
@@ -399,7 +399,7 @@ class CartService
    * 购物车当前数量
    * 购物车当前数量
    */
    */
     public static function cartMyCount($user_id,$gid=""){
     public static function cartMyCount($user_id,$gid=""){
-        $where = $user_id ? ["user_id"=>$user_id,"status"=>1]:["gid"=>$gid,"status"=>1];
+        $where = $user_id ? ["user_id"=>$user_id]:["gid"=>$gid];
         #登录后数据带入此购物车
         #登录后数据带入此购物车
         if ($user_id > 0 ){
         if ($user_id > 0 ){
             $gidCart = CartModel::where(["gid"=>$gid,"status"=>1])->get()->toArray();
             $gidCart = CartModel::where(["gid"=>$gid,"status"=>1])->get()->toArray();
@@ -412,7 +412,7 @@ class CartService
                 }
                 }
             }
             }
         }
         }
-        $mycartCountFirst = CartModel::where($where)->count();
+        $mycartCountFirst = CartModel::where($where)->wherein("status",[CartModel::status_no,CartModel::status_yes])->count();
         return $mycartCountFirst;
         return $mycartCountFirst;
     }
     }