Merge branch 'dev-xpy' into dev

app/common/repositories/store/product/ProductRepository.php

@@ -1016,6 +1016,19 @@ class ProductRepository extends BaseRepository
         }
 
         $res['isRelation'] = $isRelation ?? false;
+        foreach ($res['attrValue'] as $k => $value) {
+            $detail = $value['detail'] ?? null;
+            if (is_array($detail) && count($detail) > 0) {
+                $sku = implode(',', $detail);
+            } else {
+                $detail = ['默认'];
+                $sku = '默认';
+            }
+            $res['attrValue'][$k]['detail'] = $detail;
+            if (empty($value['sku'])) {
+                $res['attrValue'][$k]['sku'] = $sku;
+            }
+        }
         $res['sku'] = $this->detailAttrValue($res['attrValue'], $userInfo, $res['product_type']);
         $res['sales'] = $res['sales'] + $res['ficti'];
         $res['replayData'] = app()->make(ProductReplyRepository::class)->getReplyRate($res['product_id']);