diff --git a/src/main/java/cn/com/tenlion/operator/pojo/dtos/user/expand/UserExpandDTO.java b/src/main/java/cn/com/tenlion/operator/pojo/dtos/user/expand/UserExpandDTO.java
index aee42c9..4105591 100644
--- a/src/main/java/cn/com/tenlion/operator/pojo/dtos/user/expand/UserExpandDTO.java
+++ b/src/main/java/cn/com/tenlion/operator/pojo/dtos/user/expand/UserExpandDTO.java
@@ -15,6 +15,7 @@ public class UserExpandDTO extends UserDTO {
private Long priceAdditionalPkg;
private Long priceAdditionalVideoDemo;
+ private Long priceAdditionalUrgent;
private Long priceAll;
private Long priceMaterial;
private Long priceMaterialAgent;
@@ -41,6 +42,14 @@ public class UserExpandDTO extends UserDTO {
this.priceAdditionalVideoDemo = priceAdditionalVideoDemo;
}
+ public Long getPriceAdditionalUrgent() {
+ return priceAdditionalUrgent == null ? 0 : priceAdditionalUrgent;
+ }
+
+ public void setPriceAdditionalUrgent(Long priceAdditionalUrgent) {
+ this.priceAdditionalUrgent = priceAdditionalUrgent;
+ }
+
public Long getPriceAll() {
return priceAll == null ? 0 : priceAll;
}
diff --git a/src/main/java/cn/com/tenlion/operator/pojo/vos/user/expand/UserExpandVO.java b/src/main/java/cn/com/tenlion/operator/pojo/vos/user/expand/UserExpandVO.java
index 40fc137..0bfef22 100644
--- a/src/main/java/cn/com/tenlion/operator/pojo/vos/user/expand/UserExpandVO.java
+++ b/src/main/java/cn/com/tenlion/operator/pojo/vos/user/expand/UserExpandVO.java
@@ -16,6 +16,8 @@ public class UserExpandVO {
private Double priceAdditionalPkg;
@CheckNumberAnnotation(name = "视频教程价格", min = 0)
private Double priceAdditionalVideoDemo;
+ @CheckNumberAnnotation(name = "全托加急价格", min = 0)
+ private Double priceAdditionalUrgent;
@CheckNumberAnnotation(name = "全托管价格", min = 0)
private Double priceAll;
@CheckNumberAnnotation(name = "写材料价格", min = 0)
@@ -49,6 +51,14 @@ public class UserExpandVO {
this.priceAdditionalVideoDemo = priceAdditionalVideoDemo;
}
+ public Double getPriceAdditionalUrgent() {
+ return priceAdditionalUrgent == null ? 0 : priceAdditionalUrgent;
+ }
+
+ public void setPriceAdditionalUrgent(Double priceAdditionalUrgent) {
+ this.priceAdditionalUrgent = priceAdditionalUrgent;
+ }
+
public Double getPriceAll() {
return priceAll == null ? 0 : priceAll;
}
diff --git a/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java
index b3debee..af529fd 100644
--- a/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/operator/service/user/expand/UserExpandServiceImpl.java
@@ -140,6 +140,7 @@ public class UserExpandServiceImpl extends DefaultBaseService implements IUserEx
UserExpandDTO userExpandDTO = userExpandDao.get(params);
userExpandVO.setPriceAdditionalPkg(userExpandVO.getPriceAdditionalPkg() * 100);
userExpandVO.setPriceAdditionalVideoDemo(userExpandVO.getPriceAdditionalVideoDemo() * 100);
+ userExpandVO.setPriceAdditionalUrgent(userExpandVO.getPriceAdditionalUrgent() * 100);
userExpandVO.setPriceAll(userExpandVO.getPriceAll() * 100);
userExpandVO.setPriceMaterial(userExpandVO.getPriceMaterial() * 100);
userExpandVO.setPriceMaterialAgent(userExpandVO.getPriceMaterialAgent() * 100);
diff --git a/src/main/resources/mybatis/mapper/user/expand/user-expand.xml b/src/main/resources/mybatis/mapper/user/expand/user-expand.xml
index 13915c4..7e1f91e 100644
--- a/src/main/resources/mybatis/mapper/user/expand/user-expand.xml
+++ b/src/main/resources/mybatis/mapper/user/expand/user-expand.xml
@@ -6,6 +6,7 @@
+
@@ -21,6 +22,7 @@
+
@@ -37,6 +39,7 @@
user_id,
price_additional_pkg,
price_additional_video_demo,
+ price_additional_urgent,
price_all,
price_material,
price_material_agent,
@@ -50,6 +53,7 @@
#{userId},
#{priceAdditionalPkg},
#{priceAdditionalVideoDemo},
+ #{priceAdditionalUrgent},
#{priceAll},
#{priceMaterial},
#{priceMaterialAgent},
@@ -68,6 +72,7 @@
SET
price_additional_pkg = #{priceAdditionalPkg},
price_additional_video_demo = #{priceAdditionalVideoDemo},
+ price_additional_urgent = #{priceAdditionalUrgent},
price_all = #{priceAll},
price_material = #{priceMaterial},
price_material_agent = #{priceMaterialAgent},
@@ -85,6 +90,7 @@
SELECT
price_additional_pkg,
price_additional_video_demo,
+ price_additional_urgent,
price_all,
price_material,
price_material_agent,
@@ -107,6 +113,7 @@
user_id,
price_additional_pkg,
price_additional_video_demo,
+ price_additional_urgent,
price_all,
price_material,
price_material_agent,
diff --git a/src/main/resources/templates/user/expand/save-or-update.html b/src/main/resources/templates/user/expand/save-or-update.html
index e2e59bf..e5b8605 100644
--- a/src/main/resources/templates/user/expand/save-or-update.html
+++ b/src/main/resources/templates/user/expand/save-or-update.html
@@ -61,7 +61,7 @@