diff --git a/src/main/java/mjkf/xinke/main/model/db/PricePublish.java b/src/main/java/mjkf/xinke/main/model/db/PricePublish.java index 8fd5e90..46cf8a4 100644 --- a/src/main/java/mjkf/xinke/main/model/db/PricePublish.java +++ b/src/main/java/mjkf/xinke/main/model/db/PricePublish.java @@ -134,6 +134,10 @@ public class PricePublish extends Model { @TableField("PRICE_PINTAN") private BigDecimal pricePintan; + @ApiModelProperty("平潭价格") + @TableField("PRICE_ZHANGZHOUKFQ") + private BigDecimal priceZhangzhouKfq; + @ApiModelProperty("税率") @TableField("TAX") private BigDecimal tax; @@ -195,6 +199,9 @@ public class PricePublish extends Model { if (params.getPricePintan() != null) { this.setPricePintan(params.getPricePintan()); } + if (params.getPriceZhangzhouKfq() != null) { + this.setPriceZhangzhouKfq(params.getPriceZhangzhouKfq()); + } if (params.getTax() != null) { this.setTax(params.getTax()); } @@ -225,6 +232,8 @@ public class PricePublish extends Model { return this.priceNingde; } else if (region.contains("平潭")) { return this.pricePintan; + } else if (region.contains("漳州开发区")) { + return this.priceZhangzhouKfq; } return null; } diff --git a/src/main/java/mjkf/xinke/main/model/vo/PricePublishEditRequest.java b/src/main/java/mjkf/xinke/main/model/vo/PricePublishEditRequest.java index bbc5af5..f23b7b7 100644 --- a/src/main/java/mjkf/xinke/main/model/vo/PricePublishEditRequest.java +++ b/src/main/java/mjkf/xinke/main/model/vo/PricePublishEditRequest.java @@ -54,6 +54,9 @@ public class PricePublishEditRequest { @JsonProperty(value = "pricePintan") private BigDecimal pricePintan; + @JsonProperty(value = "priceZhangzhouKfq") + private BigDecimal priceZhangzhouKfq; + private BigDecimal tax; public void check() {