Merge branch 'refs/heads/dev-1.6-shouqianba' into container-test

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinFrontServiceImpl.java

@@ -300,6 +300,16 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         }
     }
 
+    /** SKU 主图未维护时，用 SPU 封面兜底（前台详情/列表展示） */
+    private void fillSkuPicIfBlank(GoblinGoodsSkuInfoDetailVo skuDetail, GoblinGoodsInfoVo spuVo) {
+        if (skuDetail == null || spuVo == null) {
+            return;
+        }
+        if (StringUtil.isBlank(skuDetail.getSkuPic()) && StringUtil.isNotBlank(spuVo.getCoverPic())) {
+            skuDetail.setSkuPic(spuVo.getCoverPic());
+        }
+    }
+
     /**
      * 获得商品详情
      */
@@ -328,6 +338,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                     log.debug("skuId:{},库存数量{}", goblinGoodsSkuInfoVo.getSkuId(), stock);
                     GoblinGoodsSkuInfoDetailVo goblinGoodsSkuInfoDetailVo = GoblinGoodsSkuInfoDetailVo.getNew();
                     BeanUtils.copyProperties(goblinGoodsSkuInfoVo, goblinGoodsSkuInfoDetailVo);
+                    fillSkuPicIfBlank(goblinGoodsSkuInfoDetailVo, goblinGoodsInfoVo);
                     if (0 != goblinGoodsSkuInfoDetailVo.getBuyLimit()) {
                         if (null == buyCount) {
                             buyCount = 0;
@@ -419,6 +430,7 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
                     log.debug("skuId:{},库存数量{}", goblinGoodsSkuInfoVo.getSkuId(), stock);
                     GoblinGoodsSkuInfoDetailVo goblinGoodsSkuInfoDetailVo = GoblinGoodsSkuInfoDetailVo.getNew();
                     BeanUtils.copyProperties(goblinGoodsSkuInfoVo, goblinGoodsSkuInfoDetailVo);
+                    fillSkuPicIfBlank(goblinGoodsSkuInfoDetailVo, goblinGoodsInfoVo);
                     if (0 != goblinGoodsSkuInfoDetailVo.getBuyLimit()) {
                         if (null == buyCount) {
                             buyCount = 0;