Merge branch 'phoenix' of ssh://120.24.33.109:11022/hyzjshwo/lanzu_api_hyperf into phoenix

app/Constants/v3/ErrorCode.php

@@ -118,25 +118,25 @@ class ErrorCode extends AbstractConstants
      * 微信登录失败：无效的code
      * @Message("微信登录失败：无效的code")
      */
-    const WXLOGIN_INVALID_CODE = 704;
+    const WXLOGIN_INVALID_CODE = 705;
 
     /**
      * 更新失败
      * @Message("更新失败")
      */
-    const USER_INFO_UPDATE_ERROR = 705;
+    const USER_INFO_UPDATE_ERROR = 706;
 
     /**
      * 商户账户密码不匹配
      * @Message("账号密码错误")
      */
-    const STORE_LOGIN_ERROR = 706;
+    const STORE_LOGIN_ERROR = 707;
 
     /**
      * 商户异常，当前商户可能不存在或失效了
      * @Message("当前商户异常")
      */
-    const STORE_NOT_AVAILABLE = 707;
+    const STORE_NOT_AVAILABLE = 708;
 
     /************************************/
     /* 定位相关 751-800 */

app/Service/v3/Implementations/ShopCartService.php

@@ -136,47 +136,21 @@ class ShopCartService implements ShopCartServiceInterface
 
     public function countGoods($userId,$marketId)
     {
-        $ShoppingCart = ShoppingCart::query()->where([
-            ['user_id','=',$userId],
-            ['market_id','=',$marketId],
-        ])->get();
-        $num = 0;
-        foreach ($ShoppingCart as $cart){
-            if($cart->activity_type == 2){
-                $goods = GoodsActivity::query()->find($cart->goods_id);
-                $goodsCheck = $this->goodsActivityService->check($goods,$cart->num,$cart->user_id);
-            }else{
-                $goods = Goods::query()->find($cart->goods_id);
-                $goodsCheck = $this->goodsService->check($goods,$cart->num);
-            }
-            if($goodsCheck){
-                $num+= $cart->num;
+        $shoppingCart = $this->allForUser($userId,$marketId);
+        $count = 0;
+        foreach ($shoppingCart['store_lists'] as $store){
+            foreach ($store['shopping_cart'] as $cart) {
+                $num = $cart['num'];
+                $count += $num;
             }
         }
-        return $num;
+        return $count;
     }
 
     public function getTotal($userId,$marketId)
     {
-        $ShoppingCart = ShoppingCart::query()->where([
-            ['user_id','=',$userId],
-            ['market_id','=',$marketId],
-        ])->get();
-        $total = 0;
-        foreach ($ShoppingCart as $cart){
-            if($cart->activity_type == 2){
-                $goods = GoodsActivity::query()->find($cart->goods_id);
-                $goodsCheck = $this->goodsActivityService->check($goods,$cart->num,$cart->user_id);
-            }else{
-                $goods = Goods::query()->find($cart->goods_id);
-                $goodsCheck = $this->goodsService->check($goods,$cart->num);
-            }
-            if($goodsCheck){
-                $subTotal = bcmul($goods->price,$cart->num);
-                $total = bcadd($subTotal,$total,2);
-            }
-        }
-        return $total;
+        $shoppingCart = $this->allForUser($userId,$marketId);
+        return $shoppingCart['total'];
     }
 
     public function getGoodsByShopcartId($shopcartIds)

app/Service/v3/Implementations/ShopCartUpdateService.php

@@ -59,6 +59,10 @@ class ShopCartUpdateService implements ShopCartUpdateServiceInterface
      */
     public function doClear($userId, $marketId)
     {
-
+        return ShoppingCart::query()->where([
+                ['user_id','=',$userId],
+                ['market_id','=',$marketId],
+            ])
+            ->delete();
     }
 }