From af68a3956d986b2bfe1a126b4c879021d9405bb4 Mon Sep 17 00:00:00 2001 From: wanggeng <450292408@qq.com> Date: Fri, 14 Jun 2024 14:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=93=E5=B1=95=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dtos/user/expand/UserExpandDTO.java | 38 +++++ .../pojo/pos/user/expand/UserExpandPO.java | 36 +++++ .../pojo/vos/user/expand/UserExpandVO.java | 44 +++++- .../mapper/user/expand/user-expand.xml | 38 ++++- .../templates/user/expand/save-or-update.html | 131 +++++++++++++++--- 5 files changed, 260 insertions(+), 27 deletions(-) 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 dd3a0d5..3d9d537 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 @@ -1,5 +1,7 @@ package cn.com.tenlion.operator.pojo.dtos.user.expand; +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; import ink.wgink.pojo.dtos.user.UserDTO; /** @@ -17,6 +19,10 @@ public class UserExpandDTO extends UserDTO { private Long priceMaterial; private Long priceMaterialAgent; private Long priceMaterialAgentUrgent; + private String availableProjType; + private String postpaid; + private Integer freeProjCount; + private Integer correctionCount; public Long getPriceAdditionalPkg() { return priceAdditionalPkg == null ? 0 : priceAdditionalPkg; @@ -65,4 +71,36 @@ public class UserExpandDTO extends UserDTO { public void setPriceMaterialAgentUrgent(Long priceMaterialAgentUrgent) { this.priceMaterialAgentUrgent = priceMaterialAgentUrgent; } + + public String getAvailableProjType() { + return availableProjType == null ? "PRICE_ALL,PRICE_MATERIAL,PRICE_FREE" : availableProjType.trim(); + } + + public void setAvailableProjType(String availableProjType) { + this.availableProjType = availableProjType; + } + + public String getPostpaid() { + return postpaid == null ? "" : postpaid.trim(); + } + + public void setPostpaid(String postpaid) { + this.postpaid = postpaid; + } + + public Integer getFreeProjCount() { + return freeProjCount == null ? 3 : freeProjCount; + } + + public void setFreeProjCount(Integer freeProjCount) { + this.freeProjCount = freeProjCount; + } + + public Integer getCorrectionCount() { + return correctionCount == null ? 3 : correctionCount; + } + + public void setCorrectionCount(Integer correctionCount) { + this.correctionCount = correctionCount; + } } diff --git a/src/main/java/cn/com/tenlion/operator/pojo/pos/user/expand/UserExpandPO.java b/src/main/java/cn/com/tenlion/operator/pojo/pos/user/expand/UserExpandPO.java index e1abc2a..75e77f8 100644 --- a/src/main/java/cn/com/tenlion/operator/pojo/pos/user/expand/UserExpandPO.java +++ b/src/main/java/cn/com/tenlion/operator/pojo/pos/user/expand/UserExpandPO.java @@ -15,6 +15,10 @@ public class UserExpandPO { private Long priceMaterial; private Long priceMaterialAgent; private Long priceMaterialAgentUrgent; + private String availableProjType; + private String postpaid; + private Integer freeProjCount; + private Integer correctionCount; public Long getPriceAdditionalPkg() { return priceAdditionalPkg == null ? 0 : priceAdditionalPkg; @@ -63,4 +67,36 @@ public class UserExpandPO { public void setPriceMaterialAgentUrgent(Long priceMaterialAgentUrgent) { this.priceMaterialAgentUrgent = priceMaterialAgentUrgent; } + + public String getAvailableProjType() { + return availableProjType == null ? "PRICE_ALL,PRICE_MATERIAL,PRICE_FREE" : availableProjType.trim(); + } + + public void setAvailableProjType(String availableProjType) { + this.availableProjType = availableProjType; + } + + public String getPostpaid() { + return postpaid == null ? "" : postpaid.trim(); + } + + public void setPostpaid(String postpaid) { + this.postpaid = postpaid; + } + + public Integer getFreeProjCount() { + return freeProjCount == null ? 3 : freeProjCount; + } + + public void setFreeProjCount(Integer freeProjCount) { + this.freeProjCount = freeProjCount; + } + + public Integer getCorrectionCount() { + return correctionCount == null ? 3 : correctionCount; + } + + public void setCorrectionCount(Integer correctionCount) { + this.correctionCount = correctionCount; + } } 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 adcdb31..890773c 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 @@ -1,5 +1,6 @@ package cn.com.tenlion.operator.pojo.vos.user.expand; +import ink.wgink.annotation.CheckEmptyAnnotation; import ink.wgink.annotation.CheckNumberAnnotation; /** @@ -19,10 +20,17 @@ public class UserExpandVO { private Double priceAll; @CheckNumberAnnotation(name = "写材料价格", min = 0) private Double priceMaterial; - @CheckNumberAnnotation(name = "写材料+代理价格", min = 0) + // @CheckNumberAnnotation(name = "写材料+代理价格", min = 0) private Double priceMaterialAgent; - @CheckNumberAnnotation(name = "写材料+代理（加急）价格", min = 0) + // @CheckNumberAnnotation(name = "写材料+代理（加急）价格", min = 0) private Double priceMaterialAgentUrgent; + @CheckEmptyAnnotation(name = "可用项目类型") + private String availableProjType; + private String postpaid; + @CheckNumberAnnotation(name = "免费项目个数", min = 0, max = 10) + private Integer freeProjCount; + @CheckNumberAnnotation(name = "资料补正次数", min = 0, max = 10) + private Integer correctionCount; public Double getPriceAdditionalPkg() { return priceAdditionalPkg == null ? 0 : priceAdditionalPkg; @@ -71,4 +79,36 @@ public class UserExpandVO { public void setPriceMaterialAgentUrgent(Double priceMaterialAgentUrgent) { this.priceMaterialAgentUrgent = priceMaterialAgentUrgent; } + + public String getAvailableProjType() { + return availableProjType == null ? "" : availableProjType.trim(); + } + + public void setAvailableProjType(String availableProjType) { + this.availableProjType = availableProjType; + } + + public String getPostpaid() { + return postpaid == null ? "" : postpaid.trim(); + } + + public void setPostpaid(String postpaid) { + this.postpaid = postpaid; + } + + public Integer getFreeProjCount() { + return freeProjCount == null ? 3 : freeProjCount; + } + + public void setFreeProjCount(Integer freeProjCount) { + this.freeProjCount = freeProjCount; + } + + public Integer getCorrectionCount() { + return correctionCount == null ? 3 : correctionCount; + } + + public void setCorrectionCount(Integer correctionCount) { + this.correctionCount = correctionCount; + } } 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 4daafa9..c9dac3d 100644 --- a/src/main/resources/mybatis/mapper/user/expand/user-expand.xml +++ b/src/main/resources/mybatis/mapper/user/expand/user-expand.xml @@ -9,6 +9,10 @@ + + + + @@ -18,6 +22,10 @@ + + + + @@ -28,7 +36,11 @@ price_all, price_material, price_material_agent, - price_material_agent_urgent + price_material_agent_urgent, + available_proj_type, + postpaid, + free_proj_count, + correction_count ) VALUES ( #{userId}, #{priceAdditionalPkg}, @@ -36,7 +48,11 @@ #{priceAll}, #{priceMaterial}, #{priceMaterialAgent}, - #{priceMaterialAgentUrgent} + #{priceMaterialAgentUrgent}, + #{availableProjType}, + #{postpaid}, + #{freeProjCount}, + #{correctionCount} ) @@ -49,7 +65,11 @@ price_all = #{priceAll}, price_material = #{priceMaterial}, price_material_agent = #{priceMaterialAgent}, - price_material_agent_urgent = #{priceMaterialAgentUrgent} + price_material_agent_urgent = #{priceMaterialAgentUrgent}, + available_proj_type = #{availableProjType}, + postpaid = #{postpaid}, + free_proj_count = #{freeProjCount}, + correction_count = #{correctionCount} WHERE user_id = #{userId} @@ -61,7 +81,11 @@ price_all, price_material, price_material_agent, - price_material_agent_urgent + price_material_agent_urgent, + available_proj_type, + postpaid, + free_proj_count, + correction_count FROM sys_user_expand WHERE @@ -77,7 +101,11 @@ price_all, price_material, price_material_agent, - price_material_agent_urgent + price_material_agent_urgent, + available_proj_type, + postpaid, + free_proj_count, + correction_count FROM sys_user_expand WHERE 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 1863e5b..8f93ebe 100644 --- a/src/main/resources/templates/user/expand/save-or-update.html +++ b/src/main/resources/templates/user/expand/save-or-update.html @@ -13,6 +13,11 @@ .layui-form-item {margin-bottom: 0;} .layui-form-label-new {width: 180px !important;} .layui-input-block-new {margin-left: 180px !important;} + .slide {width: 100%} + .slide .layui-slider {height: 38px;} + .slide .layui-slider .layui-slider-step {height: 100%;} + .slide .layui-slider .layui-slider-wrap {height: 100%; top: 0;} + .slide .layui-slider .layui-slider-wrap .layui-slider-wrap-btn {width: 20px; height: 20px;} @@ -38,28 +43,27 @@ -
-
- -
- -
-
-
-
-
- -
- -
-
-
+ + + + + + + + + + + + + + + + -
【项目附加费用】单位为元（￥），可保留两位小数，如要使用系统默认金额，设置为0即可
- +
@@ -67,13 +71,54 @@
- +
+
其他设置
+
+
+
+ +
+ + + +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
@@ -92,9 +137,11 @@ base: 'assets/layuiadmin/' //静态资源所在路径 }).extend({ index: 'lib/index' //主入口模块 - }).use(['index', 'form', 'laydate', 'laytpl'], function(){ + }).use(['index', 'form', 'laydate', 'slider'], function(){ var $ = layui.$; var form = layui.form; + var slider = layui.slider; + var common = layui.common; var userId = top.restAjax.params(window.location.href).userId; function init() { @@ -106,12 +153,43 @@ data.priceMaterialAgentUrgent = (data.priceMaterialAgentUrgent / 100).toFixed(2) data.priceAdditionalPkg = (data.priceAdditionalPkg / 100).toFixed(2) data.priceAdditionalVideoDemo = (data.priceAdditionalVideoDemo / 100).toFixed(2) + var availableProjTypeArray = data.availableProjType.split(','); + availableProjTypeArray.forEach(function(item) { + data[`availableProjType[${item}]`] = true + }); + if(data.postpaid) { + data['postpaid[ACTIVE]'] = true; + } var dataFormData = {}; for(var i in data) { dataFormData[i] = data[i] +''; } form.val('dataForm', dataFormData); form.render(null, 'dataForm'); + slider.render({ + elem: '#freeProjCountSlide', + max: 10, + min: 0, + step: 1, + showstep: true, + value: data.freeProjCount, + range: false, + change: function(value) { + $('#freeProjCount').val(value); + } + }) + slider.render({ + elem: '#correctionCountSlide', + max: 10, + min: 0, + step: 1, + showstep: true, + value: data.correctionCount, + range: false, + change: function(value) { + $('#correctionCount').val(value); + } + }) }, function(code, data) { top.dialog.msg(data.msg); }, function() { @@ -126,6 +204,19 @@ top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; + console.log(formData.field) + var availableProjTypeArray = []; + var postpaidArray = []; + for(var key in formData.field) { + if(key.indexOf('availableProjType') === 0) { + availableProjTypeArray.push(key.split('[')[1].split(']')[0]); + } + if(key.indexOf('postpaid') === 0) { + postpaidArray.push(key.split('[')[1].split(']')[0]); + } + } + formData.field.availableProjType = availableProjTypeArray.join(','); + formData.field.postpaid = postpaidArray.join(','); top.restAjax.post(`api/user/expand/save-or-update/${userId}`, formData.field, null, function(code, data) { var layerIndex = top.dialog.msg(top.dataMessage.updateSuccess, { time: 0,