Merge branch 'dev/20240313-update-spusku'

# Conflicts:
#	sql/mysql/建空库SQL/1_20240227.sql

feifan-module-mall/feifan-module-product-api/src/main/java/cn/newfeifan/mall/module/product/enums/spu/SpuTypeStatusEnum.java

@@ -0,0 +1,38 @@
+package cn.newfeifan.mall.module.product.enums.spu;
+
+import cn.newfeifan.mall.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 商品 SPU 状态
+ *
+ * @author 非繁源码
+ */
+@Getter
+@AllArgsConstructor
+public enum SpuTypeStatusEnum implements IntArrayValuable {
+
+    VIRTUAL_SPU(1, "虚拟商品"),
+    REAL_SPU(2, "实体商品");
+
+    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(SpuTypeStatusEnum::getStatus).toArray();
+
+    /**
+     * 状态
+     */
+    private final Integer status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+    @Override
+    public int[] array() {
+        return ARRAYS;
+    }
+
+
+}

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

@@ -48,4 +48,12 @@ public class ProductSkuRespVO {
     @Schema(description = "属性数组")
     private List<ProductSkuSaveReqVO.Property> properties;
 
+    @Schema(description = "推广费, 单位: 分")
+    private Integer promotionFee;
+
+    @Schema(description = "备注")
+    private String mark;
+
+
+
 }

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

@@ -50,6 +50,13 @@ public class ProductSkuSaveReqVO {
     @Schema(description = "二级分销的佣金，单位：分", example = "19")
     private Integer secondBrokeragePrice;
 
+
+    @Schema(description = "推广费, 单位: 分")
+    private Integer promotionFee;
+
+    @Schema(description = "备注")
+    private String mark;
+
     @Schema(description = "属性数组")
     private List<Property> properties;
 

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

@@ -42,6 +42,13 @@ public class ProductSpuPageReqVO extends PageParam {
      */
     public static final Integer RECYCLE_BIN = 4;
 
+    @Schema(description = "产地")
+    private String producerArea;
+
+    @Schema(description = "商品类别", example = "1")
+    private Integer spuType;
+
+
     @Schema(description = "商品名称", example = "清凉小短袖")
     private String name;
 
@@ -55,4 +62,11 @@ public class ProductSpuPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+
+    @Schema(description = "推广费, 单位: 分")
+    private Integer promotionFee;
+
+    @Schema(description = "备注")
+    private String mark;
+
 }

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

@@ -123,4 +123,10 @@ public class ProductSpuRespVO {
     @ExcelProperty("商品点击量")
     private Integer browseCount;
 
+    @Schema(description = "产地")
+    private String producerArea;
+
+    @Schema(description = "商品类别", example = "1")
+    private Integer spuType;
+
 }

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

@@ -93,4 +93,10 @@ public class ProductSpuSaveReqVO {
     @Valid
     private List<ProductSkuSaveReqVO> skus;
 
+    @Schema(description = "产地")
+    private String producerArea;
+
+    @Schema(description = "商品类别", example = "1")
+    private Integer spuType;
+
 }

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

@@ -94,6 +94,15 @@ public class ProductSkuDO extends BaseDO {
      * 商品销量
      */
     private Integer salesCount;
+    /**
+     * 推广费, 单位: 分
+     */
+    private Integer promotionFee;
+    /**
+     * 备注
+     */
+    private String mark;
+
 
     /**
      * 商品属性

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

@@ -168,4 +168,14 @@ public class ProductSpuDO extends BaseDO {
      * 浏览量
      */
     private Integer browseCount;
+    /**
+     * 产地
+     */
+    private String producerArea;
+    /**
+     * 商品类别
+     */
+    private Integer spuType;
+
+
 }

sql/mysql/建空库SQL/1_20240227.sql

@@ -114,6 +114,23 @@ ALTER TABLE system_menu ADD COLUMN category_id bigint NULL COMMENT '用户类型
 /*用户表system_users还要添加店铺ID字段*/
 ALTER TABLE system_users ADD COLUMN shop_id bigint NULL COMMENT '店铺id';
 
+ALTER TABLE `member_user` MODIFY COLUMN `future_member_worth_value` bigint(0) NULL DEFAULT NULL COMMENT '未来身价值，未来身价值=当前身价值+预增加身价值' AFTER `pre_added_member_worth_value`;
+ALTER TABLE `sale_merchant` ADD COLUMN `logo_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'logo地址' AFTER `id`;
+ALTER TABLE `sale_shop` ADD COLUMN `logo_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'logo地址' AFTER `id`;
+
+
+-- 修改spu以及sku表字段
+ALTER TABLE `product_sku` ADD COLUMN `Promotion_fee` int(0) NULL DEFAULT NULL COMMENT '推广费, 单位: 分' AFTER `price`;
+ALTER TABLE `product_sku` ADD COLUMN `mark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '备注' AFTER `Promotion_fee`;
+
+ALTER TABLE `product_spu` ADD COLUMN `producer_area` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '产地' AFTER `description`;
+ALTER TABLE `product_spu` ADD COLUMN `spu_type` bit(1) NULL DEFAULT NULL COMMENT '商品类别' AFTER `producer_area`;
+
+
+
+
+
+
 ALTER TABLE `member_user` MODIFY COLUMN `future_member_worth_value` bigint(0) NULL DEFAULT NULL COMMENT '未来身价值，未来身价值=当前身价值+预增加身价值' AFTER `pre_added_member_worth_value`;
 ALTER TABLE `sale_merchant` ADD COLUMN `logo_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'logo地址' AFTER `id`;
 ALTER TABLE `sale_shop` ADD COLUMN `logo_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'logo地址' AFTER `id`;