配件资料增加参数

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsBean.java

@@ -119,4 +119,19 @@ public class WebsitGoodsBean {
 
     @ApiModelProperty(value = "进价范围最大")
     private BigDecimal costRangeMax;
+
+    @ApiModelProperty(value = "优惠价1")
+    private BigDecimal firstPrice;
+
+    @ApiModelProperty(value = "优惠价2")
+    private BigDecimal secondPrice;
+
+    @ApiModelProperty(value = "是否首选配件 false=非首选配件 true=首选配件")
+    private Boolean isHeadParts;
+
+    @ApiModelProperty(value = "返厂方式")
+    private String refundFactoryMode;
+
+    @ApiModelProperty(value = "物料组名称")
+    private String materialGroupName;
 }

mall-server-api/src/main/java/com/gree/mall/manager/enums/material/HeadPartsEnum.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.enums.material;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public enum HeadPartsEnum implements BaseEnum,IEnum<Boolean> {
+    Y("true","首选配件"),
+    N("false","非首选配件"),
+    ;
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+    private final String remark;
+
+
+    @Override
+    public Boolean getValue() {
+        return Boolean.parseBoolean(key);
+    }
+}

mall-server-api/src/main/java/com/gree/mall/manager/enums/material/PartsWebsitAttrEnum.java

@@ -0,0 +1,28 @@
+package com.gree.mall.manager.enums.material;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.gree.mall.manager.enums.base.BaseEnum;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
+public enum PartsWebsitAttrEnum implements BaseEnum,IEnum<Boolean> {
+    INNER("true","内区"),
+    OUT("false","外区"),
+    ;
+
+    @EnumValue
+    @JsonValue
+    private final String key;
+    private final String remark;
+
+
+    @Override
+    public Boolean getValue() {
+        return Boolean.parseBoolean(key);
+    }
+}

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/WebsitGoodsLogic.java

@@ -216,6 +216,12 @@ public class WebsitGoodsLogic {
     private void handlePartsInfo(HttpServletRequest request, WebsitGoods goods, WebsitGoodsBean bean) {
         if (goods.getGoodsType().equals(WebsitGoodsTypeEnum.P.getKey())) {
             if (goods.getNormType().equals(NormTypeEnum.M.getKey())) {
+                if (Objects.isNull(goods.getFirstPrice())) {
+                    throw new RemoteServiceException("优惠价1不能为空");
+                }
+                if (Objects.isNull(goods.getSecondPrice())) {
+                    throw new RemoteServiceException("优惠价2不能为空");
+                }
                 if (CollectionUtil.isNotEmpty(bean.getBrandList())) {
                     List<Brand> brandList = brandService.lambdaQuery()
                             .eq(Brand::getCompanyWechatId, bean.getCompanyWechatId())