Merge branch 'dev/2024/03/27/update-sku-spu'

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuRespVO.java

@@ -58,4 +58,7 @@ public class ProductSkuRespVO {
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
 
+    @Schema(description = "商户id", example = "8240")
+    private Long merchantId;
+
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSkuSaveReqVO.java

@@ -82,4 +82,7 @@ public class ProductSkuSaveReqVO {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+
+    @Schema(description = "商户id", example = "8240")
+    private Long merchantId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java

@@ -71,4 +71,8 @@ public class ProductSpuPageReqVO extends PageParam {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+
+
+    @Schema(description = "商户id", example = "8240")
+    private Long merchantId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuRespVO.java

@@ -131,4 +131,8 @@ public class ProductSpuRespVO {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+
+
+    @Schema(description = "商户id", example = "8240")
+    private Long merchantId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSaveReqVO.java

@@ -101,4 +101,8 @@ public class ProductSpuSaveReqVO {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+
+
+    @Schema(description = "商户id", example = "8240")
+    private Long merchantId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/spu/vo/ProductSpuSimpleRespVO.java

@@ -40,4 +40,6 @@ public class ProductSpuSimpleRespVO {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+    @Schema(description = "商户id", example = "8240")
+    private Long merchantId;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/sku/ProductSkuDO.java

@@ -105,6 +105,9 @@ public class ProductSkuDO extends BaseDO {
 
 
     private Long shopId;
+
+
+    private Long merchantId;
     /**
      * 商品属性
      */

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/spu/ProductSpuDO.java

@@ -179,6 +179,7 @@ public class ProductSpuDO extends BaseDO {
 
 
     private Long shopId;
+    private Long merchantId;
 
 
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/spu/ProductSpuServiceImpl.java

@@ -59,6 +59,14 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         // 校验分类、品牌
         validateCategory(createReqVO.getCategoryId());
         brandService.validateProductBrand(createReqVO.getBrandId());
+
+        // 根据商户ID查询对应的店铺ID
+        // todo 后续如果存在多店铺的情况下
+
+
+
+
+
         // 校验 SKU
         List<ProductSkuSaveReqVO> skuSaveReqList = createReqVO.getSkus();
         productSkuService.validateSkuList(skuSaveReqList, createReqVO.getSpecType());

feifan-module-sale/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/sale/controller/admin/shop/vo/ShopRespVO.java

@@ -37,4 +37,12 @@ public class ShopRespVO {
     @ExcelProperty("logo地址")
     private String logoUrl;
 
+    @Schema(description = "域名", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @ExcelProperty("域名")
+    private String website;
+
+    @Schema(description = "最后更新时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("最后更新时间")
+    private LocalDateTime updateTime;
+
 }