From 8ccbffbbbf8673104d905bea40763a7f0d9e877e Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Fri, 14 Jun 2024 09:54:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(price-publish):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=BC=B3=E5=B7=9E=E5=BC=80=E5=8F=91=E5=8C=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/mjkf/xinke/main/model/db/PricePublish.java | 9 +++++++++
 .../xinke/main/model/vo/PricePublishEditRequest.java     | 3 +++
 2 files changed, 12 insertions(+)

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<PricePublish> {
     @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<PricePublish> {
         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<PricePublish> {
             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() {