Merge branch 'dev'

app/common/dao/store/shipping/ShippingTemplateDao.php

@@ -89,7 +89,7 @@ class ShippingTemplateDao  extends BaseDao
 //        return ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select();
         $list = ($this->getModel())::getDB()->where('mer_id',$merId)->field('shipping_template_id,name')->select()->toArray();
         $default = ['shipping_template_id' => 105, 'name' => '默认包邮'];//默认
-        $list[] = $default;
+        array_unshift($list, $default);
         return $list;
     }
 

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

@@ -418,8 +418,12 @@ class ProductRepository extends BaseRepository
                 $value['plate_mer_profit'] = $value['gong_mer_profit'];
 
                 $sku = '';
-                if (isset($value['detail']) && is_array($value['detail'])) {
+                if (isset($value['detail']) && is_array($value['detail']) && count($value['detail']) > 0) {
                     $sku = implode(',', $value['detail']);
+                } else {
+                    // 单规格情况，detail填充默认内容
+                    $value['detail'] = ['默认'];
+                    $sku = '默认';
                 }
                 $product_data = Db::name('store_product')->where('product_id', $id)->value('spu_id');
                 if ($product_data) {
@@ -1012,6 +1016,11 @@ class ProductRepository extends BaseRepository
         }
 
         $res['isRelation'] = $isRelation ?? false;
+        foreach ($res['attrValue'] as $k => $value) {//兜底单规格老商品，如果没有那就填充默认
+            if (empty($value['sku'])) {
+                $res['attrValue'][$k]['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']);