首次提交

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionson/vo/PartitionSonRespVO.java

@@ -41,12 +41,9 @@ public class PartitionSonRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
-    @Schema(description = "用户名称", example = "非繁人")
-    @ExcelProperty("用户名称")
-    private String name;
 
     @Schema(description = "用户昵称", example = "李四")
     @ExcelProperty("用户昵称")
-    private String nickName;
+    private String userName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionson/vo/PartitionSonSaveReqVO.java

@@ -32,11 +32,8 @@ public class PartitionSonSaveReqVO {
 
     @Schema(description = "是否是大区 0为小区 1为大区")
     private Integer size;
-    @Schema(description = "用户名称", example = "非繁人")
-    private String name;
-
     @Schema(description = "用户昵称", example = "李四")
-    private String nickName;
+    private String userName;
 
 
 }

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

@@ -40,12 +40,6 @@ public class ProductSkuRespVO {
     @Schema(description = "商品体积,单位：m^3 平米", example = "2.5")
     private Double volume;
 
-    @Schema(description = "一级分销的佣金，单位：分", example = "199")
-    private Integer firstBrokeragePrice;
-
-    @Schema(description = "二级分销的佣金，单位：分", example = "19")
-    private Integer secondBrokeragePrice;
-
     @Schema(description = "属性数组")
     private List<ProductSkuSaveReqVO.Property> properties;
 
@@ -61,13 +55,7 @@ public class ProductSkuRespVO {
     @Schema(description = "商户id", example = "8240")
     private Long merchantId;
 
-    @Schema(description = "高精度价格", example = "9255")
-    private BigDecimal highPrecisionPrice;
-
     @Schema(description = "结算价，单位： 分", example = "19500")
     private Integer settlementPrice;
 
-    @Schema(description = "高精度结算价", example = "19997")
-    private BigDecimal highPrecisionSettlementPrice;
-
 }

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

@@ -39,13 +39,6 @@ public class ProductSkuSaveReqVO {
     @Schema(description = "商品体积,单位：m^3 平米", example = "2.5")
     private Double volume;
 
-    @Schema(description = "一级分销的佣金，单位：分", example = "199")
-    private Integer firstBrokeragePrice;
-
-    @Schema(description = "二级分销的佣金，单位：分", example = "19")
-    private Integer secondBrokeragePrice;
-
-
     @Schema(description = "推广费, 单位: 分")
     private Integer promotionFee;
 
@@ -81,12 +74,6 @@ public class ProductSkuSaveReqVO {
     @Schema(description = "商户id", example = "8240")
     private Long merchantId;
 
-    @Schema(description = "高精度价格", example = "9255")
-    private BigDecimal highPrecisionPrice;
-
     @Schema(description = "结算价，单位： 分", example = "19500")
     private Integer settlementPrice;
-
-    @Schema(description = "高精度结算价", example = "19997")
-    private BigDecimal highPrecisionSettlementPrice;
 }

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -64,6 +65,9 @@ public class ProductSpuPageReqVO extends PageParam {
     @Schema(description = "商品分类编号", example = "1")
     private Long categoryId;
 
+    @Schema(description = "商品分区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long areaId;
+
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
@@ -88,9 +92,4 @@ public class ProductSpuPageReqVO extends PageParam {
     @Schema(description = "店铺编号集")
     private List<Long> shopIds;
 
-    @Schema(description = "高精度价格", example = "9255")
-    private BigDecimal highPrecisionPrice;
-
-    @Schema(description = "高精度", requiredMode = Schema.RequiredMode.REQUIRED)
-    private Boolean highPrecision;
-}
+}

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

@@ -9,6 +9,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -44,9 +45,9 @@ public class ProductSpuRespVO {
     @ExcelProperty("商品分类编号")
     private Long categoryId;
 
-    @Schema(description = "商品品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("商品品牌编号")
-    private Long brandId;
+    @Schema(description = "商品分区编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @ExcelProperty("商品分区编号")
+    private Long areaId;
 
     @Schema(description = "商品封面图", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.zhongxing.cn/xx.png")
     @ExcelProperty("商品封面图")
@@ -102,16 +103,6 @@ public class ProductSpuRespVO {
     @ExcelProperty("物流配置模板编号")
     private Long deliveryTemplateId;
 
-    // ========== 营销相关字段 =========
-
-    @Schema(description = "赠送积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "111")
-    @ExcelProperty("赠送积分")
-    private Integer giveIntegral;
-
-    @Schema(description = "分销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    @ExcelProperty("分销类型")
-    private Boolean subCommissionType;
-
     // ========== 统计相关字段 =========
 
     @Schema(description = "商品销量", requiredMode = Schema.RequiredMode.REQUIRED, example = "2000")
@@ -140,14 +131,4 @@ public class ProductSpuRespVO {
 
     @Schema(description = "商户id", example = "8240")
     private Long merchantId;
-    @Schema(description = "商品支付类别")
-    private Integer spuPayType;
-
-    @Schema(description = "高精度", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("高精度")
-    private Boolean highPrecision;
-
-    @Schema(description = "高精度价格", example = "9255")
-    @ExcelProperty("高精度价格")
-    private BigDecimal highPrecisionPrice;
 }

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

@@ -79,17 +79,6 @@ public class ProductSkuDO extends BaseDO {
      */
     private Double volume;
 
-    /**
-     * 一级分销的佣金，单位：分
-     */
-    private Integer firstBrokeragePrice;
-    /**
-     * 二级分销的佣金，单位：分
-     */
-    private Integer secondBrokeragePrice;
-
-    // ========== 营销相关字段 =========
-
     // ========== 统计相关字段 =========
     /**
      * 商品销量
@@ -110,19 +99,10 @@ public class ProductSkuDO extends BaseDO {
 
     private Long merchantId;
 
-    /**
-     * 高精度价格
-     */
-    private BigDecimal highPrecisionPrice;
-
     /**
      * 结算价，单位： 分
      */
     private Integer settlementPrice;
-    /**
-     * 高精度结算价
-     */
-    private BigDecimal highPrecisionSettlementPrice;
     /**
      * 商品属性
      */
@@ -173,12 +153,5 @@ public class ProductSkuDO extends BaseDO {
         }
 
     }
-
-    // TODO 非繁人：integral from y
-    // TODO 非繁人：pinkPrice from y
-    // TODO 非繁人：seckillPrice from y
-    // TODO 非繁人：pinkStock from y
-    // TODO 非繁人：seckillStock from y
-
 }
 

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

@@ -68,10 +68,9 @@ public class ProductSpuDO extends BaseDO {
      */
     private Long categoryId;
     /**
-     * 商品品牌编号
-     * 关联 {@link ProductBrandDO#getId()}
+     * 商品分区编号
      */
-    private Long brandId;
+    private Long areaId;
     /**
      * 商品封面图
      */
@@ -135,21 +134,6 @@ public class ProductSpuDO extends BaseDO {
      */
     private Long deliveryTemplateId;
 
-    // ========== 营销相关字段 =========
-
-    /**
-     * 赠送积分
-     */
-    private Integer giveIntegral;
-
-    // TODO @puhui999：字段估计要改成 brokerageType
-    /**
-     * 分销类型
-     * false - 默认
-     * true - 自行设置
-     */
-    private Boolean subCommissionType;
-
     // ========== 统计相关字段 =========
 
     /**
@@ -183,20 +167,6 @@ public class ProductSpuDO extends BaseDO {
      */
     private Long merchantId;
 
-    /**
-     * 商品支付类别
-     */
-    private Integer spuPayType;
-
-    /**
-     * 高精度
-     */
-    private Boolean highPrecision;
-    /**
-     * 高精度价格
-     */
-    private BigDecimal highPrecisionPrice;
-
     /**
      * 商品申请id
      */

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/sku/ProductSkuServiceImpl.java

@@ -49,14 +49,6 @@ public class ProductSkuServiceImpl implements ProductSkuService {
     @Resource
     private ProductPropertyValueService productPropertyValueService;
 
-    @Override
-    public void deleteSku(Long id) {
-        // 校验存在
-        validateSkuExists(id);
-        // 删除
-        productSkuMapper.deleteById(id);
-    }
-
     private void validateSkuExists(Long id) {
         if (productSkuMapper.selectById(id) == null) {
             throw exception(SKU_NOT_EXISTS);