Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

# Conflicts:
#	app/Service/v3/Implementations/ShopCartService.php

app/Service/v3/Implementations/CategoryService.php

@@ -37,9 +37,9 @@ class CategoryService implements CategoryServiceInterface
 
     public function allForStore($storeId)
     {
-        $goodsTypeIds = Goods::query()->select('category_id')
+        $goodsTypeIds = Goods::query()->select('id','category_id')
             ->where(['store_id' => $storeId])
-            ->groupBy(['category_id'])
+            ->groupBy('category_id', 'id')
             ->get()->toArray();
 
         return Category::query()

app/Service/v3/Implementations/OrderOnlineService.php

@@ -136,8 +136,9 @@ class OrderOnlineService implements OrderOnlineServiceInterface
                 $storeTypeIds[] = (string)$storeType;
                 // 店铺今天的订单数
                 $count = Order::query()
-                    ->where(['store_id' => $storeId, 'type' => OrderType::ONLINE])
-                    ->whereBetween('created_at', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))])
+                    ->join('lanzu_order_main as main', 'main.id', '=', 'lanzu_order.order_main_id')
+                    ->where(['lanzu_order.store_id' => $storeId, 'main.type' => OrderType::ONLINE])
+                    ->whereBetween('lanzu_order.created_at', [strtotime(date('Y-m-d 00:00:00')), strtotime(date('Y-m-d 23:59:59'))])
                     ->count();
 
                 // 用户购物车数据

app/Service/v3/Implementations/PaymentService.php

@@ -77,6 +77,7 @@ class PaymentService implements PaymentServiceInterface
             ];
 
             $parameters['paySign'] = $this->signture($parameters, $config['key']);
+            $parameters['order_main_id'] = $orderMain->id;
 
             return $parameters;
 

app/Service/v3/Implementations/ShopCartService.php

@@ -84,7 +84,7 @@ class ShopCartService implements ShopCartServiceInterface
         ])
             ->select('num')
             ->first();
-        return $ShoppingCart->num;
+        return $ShoppingCart->num ?? 0;
     }
 
     public function undo($userId,$marketId)