From 9f6a22a06538e823a956769b4275f1bcb8a24efe Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Sun, 28 May 2023 22:15:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=94=B9=EF=BC=8CPC?= =?UTF-8?q?=E5=8F=91=E5=8D=95=E6=89=A3=E7=82=B9=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 6 +- .../templates/goods/deptcategory/edit.html | 80 +++++++++++++++++++ .../ghy/goods/domain/DeptGoodsCategory.java | 22 +++++ .../mapper/goods/DeptGoodsCategoryMapper.xml | 45 +++++++++++ 4 files changed, 150 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/resources/application-druid.yml b/ghy-admin/src/main/resources/application-druid.yml index d12dcfad..e228b87b 100644 --- a/ghy-admin/src/main/resources/application-druid.yml +++ b/ghy-admin/src/main/resources/application-druid.yml @@ -45,7 +45,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.4.113.60:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://103.39.234.64:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: admin password: Clunt@12345 # 从库数据源 @@ -58,9 +58,9 @@ spring: # 初始连接数 initialSize: 5 # 最小连接池数量 - minIdle: 10 + minIdle: 5 # 最大连接池数量 - maxActive: 20 + maxActive: 10 # 配置获取连接等待超时的时间 maxWait: 60000 # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html index c3bc407c..ec870f34 100644 --- a/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html +++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html @@ -23,6 +23,8 @@ + +
@@ -33,6 +35,16 @@
+
+
+ +
+ +
+
+
@@ -46,6 +58,18 @@
+
+
+ +
+ +
+
+
+ +
@@ -56,6 +80,16 @@
+
+
+ +
+ +
+
+
@@ -69,6 +103,19 @@
+
+
+ +
+ +
+
+
+ + +
@@ -79,6 +126,16 @@
+
+
+ +
+ +
+
+
@@ -92,6 +149,19 @@
+
+
+ +
+ +
+
+
+ + +
@@ -102,6 +172,16 @@
+
+
+ +
+ +
+
+
diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java index dd4b0e6d..cd8b4e6f 100644 --- a/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java +++ b/ghy-goods/src/main/java/com/ghy/goods/domain/DeptGoodsCategory.java @@ -51,6 +51,28 @@ public class DeptGoodsCategory extends GoodsCategory { @Excel(name = "截留金额", cellType = Excel.ColumnType.STRING) private BigDecimal retainMoney; + + @Excel(name = "平台*一级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String pcOneRate; + + @Excel(name = "平台*二级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String pcTwoRate; + + @Excel(name = "平台*三级分销扣点比例", cellType = Excel.ColumnType.STRING) + private String pcThreeRate; + + @Excel(name = "平台*平台扣点", cellType = Excel.ColumnType.STRING) + private String pcDeptRate; + + @Excel(name = "平台*平台固定扣金额", cellType = Excel.ColumnType.STRING) + private BigDecimal pcDeptMoney; + + @Excel(name = "平台*截留扣点", cellType = Excel.ColumnType.STRING) + private String pcRetainRate; + + @Excel(name = "平台*截留金额", cellType = Excel.ColumnType.STRING) + private BigDecimal pcRetainMoney; + @Excel(name = "类别类型. 1.服务类 2.商品类", cellType = Excel.ColumnType.STRING) private Integer type; diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml index c4be941c..6c35c4c3 100644 --- a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml +++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml @@ -23,6 +23,15 @@ + + + + + + + + + @@ -35,6 +44,7 @@ SELECT dept_goods_category_id, dept_id, goods_category_id, category_sort, is_hot, cover, hot_name, simple_goods_category_name, is_sure, is_cert, one_rate, two_rate, three_rate, dept_rate, + pc_one_rate, pc_two_rate, pc_three_rate, pc_dept_rate, pc_dept_money, pc_retain_rate, pc_retain_money, dept_money, retain_rate, retain_money, create_by, create_time, remark FROM dept_goods_category @@ -44,6 +54,7 @@ dgc.one_rate, dgc.two_rate, dgc.three_rate, dgc.create_by, dgc.create_time, dgc.remark, dgc.is_hot, dgc.cover, dgc.hot_name, dgc.is_sure, dgc.is_cert, dgc.dept_rate, dgc.dept_money, dgc.retain_rate, dgc.retain_money, dgc.simple_goods_category_name, + dgc.pc_one_rate, dgc.pc_two_rate, dgc.pc_three_rate, dgc.pc_dept_rate, dgc.pc_dept_money, dgc.pc_retain_rate, dgc.pc_retain_money, gc.goods_category_name, gc.level, gc.parent_category_id, gc.type, gc.status FROM dept_goods_category dgc LEFT JOIN goods_category gc ON dgc.goods_category_id = gc.goods_category_id @@ -81,10 +92,21 @@ dept_money = #{deptMoney}, retain_rate = #{retainRate}, retain_money = #{retainMoney}, + + pc_dept_rate = #{pcDeptRate}, + pc_dept_money = #{pcDeptMoney}, + pc_retain_rate = #{pcRetainRate}, + pc_retain_money = #{pcRetainMoney}, + category_sort = #{categorySort}, one_rate = #{oneRate}, two_rate = #{twoRate}, three_rate = #{threeRate}, + + pc_one_rate = #{pcOneRate}, + pc_two_rate = #{pcTwoRate}, + pc_three_rate = #{pcThreeRate}, + remark = #{remark}, update_by = #{updateBy}, update_time = sysdate() @@ -111,12 +133,23 @@ dept_money, retain_rate, retain_money, + + pc_dept_rate, + pc_dept_money, + pc_retain_rate, + pc_retain_money, + dept_id, goods_category_id, category_sort, one_rate, two_rate, three_rate, + + pc_one_rate, + pc_two_rate, + pc_three_rate, + create_by, create_time )values( @@ -125,12 +158,24 @@ #{deptMoney}, #{retainRate}, #{retainMoney}, + + #{pcDeptRate}, + #{pcDeptMoney}, + #{pcRetainRate}, + #{pcRetainMoney}, + #{deptId}, #{goodsCategoryId}, #{categorySort}, + #{oneRate}, #{twoRate}, #{threeRate}, + + #{pcOneRate}, + #{pcTwoRate}, + #{pcThreeRate}, + #{createBy}, sysdate() )