数据更改，PC发单扣点编辑

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
             # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒

ghy-admin/src/main/resources/templates/goods/deptcategory/edit.html

@@ -23,6 +23,8 @@
                     </div>
                 </div>
             </div>
+        </div>
+        <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-6 control-label is-required">一级分销扣点比例：</label>
@@ -33,6 +35,16 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">PC一级分销扣点比例：</label>
+                    <div class="col-sm-6">
+                        <input name="pcOneRate" placeholder="请输入PC一级分销扣点比例" class="form-control" type="text" maxlength="12"
+                               th:field="*{pcOneRate}"
+                               required>
+                    </div>
+                </div>
+            </div>
         </div>
 
         <div class="row">
@@ -46,6 +58,18 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">PC二级分销扣点比例：</label>
+                    <div class="col-sm-6">
+                        <input name="pcTwoRate" placeholder="请输入PC二级分销扣点比例" class="form-control" type="text"
+                               th:field="*{pcTwoRate}"
+                               maxlength="12" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-6 control-label is-required">三级分销扣点比例：</label>
@@ -56,6 +80,16 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">PC三级分销扣点比例：</label>
+                    <div class="col-sm-6">
+                        <input name="pcThreeRate" placeholder="PC请输入三级分销扣点比例" class="form-control" type="text" maxlength="12"
+                               th:field="*{pcThreeRate}"
+                               required>
+                    </div>
+                </div>
+            </div>
         </div>
 
         <div class="row">
@@ -69,6 +103,19 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">PC平台扣点比例：</label>
+                    <div class="col-sm-6">
+                        <input name="pcDeptRate" placeholder="请输入PC平台扣点比例" class="form-control" type="text"
+                               th:field="*{pcDeptRate}"
+                               maxlength="12" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-6 control-label is-required">平台固定扣金额：</label>
@@ -79,6 +126,16 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">PC平台固定扣金额：</label>
+                    <div class="col-sm-6">
+                        <input name="pcDeptMoney" placeholder="请输入PC平台固定扣金额" class="form-control" type="text" maxlength="12"
+                               th:field="*{pcDeptMoney}"
+                               required>
+                    </div>
+                </div>
+            </div>
         </div>
 
         <div class="row">
@@ -92,6 +149,19 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">PC截留扣点：</label>
+                    <div class="col-sm-6">
+                        <input name="pcRetainRate" placeholder="请输入PC截留扣点" class="form-control" type="text"
+                               th:field="*{pcRetainRate}"
+                               maxlength="12" required>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
                     <label class="col-sm-6 control-label is-required">截留金额：</label>
@@ -102,6 +172,16 @@
                     </div>
                 </div>
             </div>
+            <div class="col-sm-6">
+                <div class="form-group">
+                    <label class="col-sm-6 control-label is-required">PC截留金额：</label>
+                    <div class="col-sm-6">
+                        <input name="pcRetainMoney" placeholder="请输入PC截留金额" class="form-control" type="text" maxlength="12"
+                               th:field="*{pcRetainMoney}"
+                               required>
+                    </div>
+                </div>
+            </div>
         </div>
 
         <div class="row">

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;
 

ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml

@@ -23,6 +23,15 @@
         <result property="deptMoney"                column="dept_money"/>
         <result property="retainRate"               column="retain_rate"/>
         <result property="retainMoney"              column="retain_money"/>
+        <!-- pc扣点部分 start-->
+        <result property="pcOneRate"                  column="pc_one_rate"/>
+        <result property="pcTwoRate"                  column="pc_two_rate"/>
+        <result property="pcThreeRate"                column="pc_three_rate"/>
+        <result property="pcDeptRate"                 column="pc_dept_rate"/>
+        <result property="pcDeptMoney"                column="pc_dept_money"/>
+        <result property="pcRetainRate"               column="pc_retain_rate"/>
+        <result property="pcRetainMoney"              column="pc_retain_money"/>
+        <!-- pc扣点部分 end-->
         <result property="isSure"                   column="is_sure"/>
         <result property="isCert"                   column="is_cert"/>
         <result property="createBy"                 column="create_by"/>
@@ -35,6 +44,7 @@
     <sql id="selectDeptGoodsCategory">
         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
     </sql>
@@ -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
     </sql>
@@ -81,10 +92,21 @@
             <if test="deptMoney != null and deptMoney != ''">dept_money = #{deptMoney},</if>
             <if test="retainRate != null and retainRate != ''">retain_rate = #{retainRate},</if>
             <if test="retainMoney != null and retainMoney != ''">retain_money = #{retainMoney},</if>
+
+            <if test="pcDeptRate != null and pcDeptRate != ''">pc_dept_rate = #{pcDeptRate},</if>
+            <if test="pcDeptMoney != null and pcDeptMoney != ''">pc_dept_money = #{pcDeptMoney},</if>
+            <if test="pcRetainRate != null and pcRetainRate != ''">pc_retain_rate = #{pcRetainRate},</if>
+            <if test="pcRetainMoney != null and pcRetainMoney != ''">pc_retain_money = #{pcRetainMoney},</if>
+
             <if test="categorySort != null">category_sort = #{categorySort},</if>
             <if test="oneRate != null and oneRate != ''">one_rate = #{oneRate},</if>
             <if test="twoRate != null and twoRate != ''">two_rate = #{twoRate},</if>
             <if test="threeRate != null and threeRate != ''">three_rate = #{threeRate},</if>
+
+            <if test="pcOneRate != null and pcOneRate != ''">pc_one_rate = #{pcOneRate},</if>
+            <if test="pcTwoRate != null and pcTwoRate != ''">pc_two_rate = #{pcTwoRate},</if>
+            <if test="pcThreeRate != null and pcThreeRate != ''">pc_three_rate = #{pcThreeRate},</if>
+
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
@@ -111,12 +133,23 @@
         <if test="deptMoney != null and deptMoney != ''">dept_money,</if>
         <if test="retainRate != null and retainRate != ''">retain_rate,</if>
         <if test="retainMoney != null and retainMoney != ''">retain_money,</if>
+
+        <if test="pcDeptRate != null and pcDeptRate != ''">pc_dept_rate,</if>
+        <if test="pcDeptMoney != null and pcDeptMoney != ''">pc_dept_money,</if>
+        <if test="pcRetainRate != null and pcRetainRate != ''">pc_retain_rate,</if>
+        <if test="pcRetainMoney != null and pcRetainMoney != ''">pc_retain_money,</if>
+
         <if test="deptId != null and deptId != ''">dept_id,</if>
         <if test="goodsCategoryId != null">goods_category_id,</if>
         <if test="categorySort != null">category_sort,</if>
         <if test="oneRate != null and oneRate != ''">one_rate,</if>
         <if test="twoRate != null and twoRate != ''">two_rate,</if>
         <if test="threeRate != null and threeRate != ''">three_rate,</if>
+
+        <if test="pcOneRate != null and pcOneRate != ''">pc_one_rate,</if>
+        <if test="pcTwoRate != null and pcTwoRate != ''">pc_two_rate,</if>
+        <if test="pcThreeRate != null and pcThreeRate != ''">pc_three_rate,</if>
+
         <if test="createBy != null and createBy != ''">create_by,</if>
         create_time
         )values(
@@ -125,12 +158,24 @@
         <if test="deptMoney != null and deptMoney != ''">#{deptMoney},</if>
         <if test="retainRate != null and retainRate != ''">#{retainRate},</if>
         <if test="retainMoney != null and retainMoney != ''">#{retainMoney},</if>
+
+        <if test="pcDeptRate != null and pcDeptRate != ''">#{pcDeptRate},</if>
+        <if test="pcDeptMoney != null and pcDeptMoney != ''">#{pcDeptMoney},</if>
+        <if test="pcRetainRate != null and pcRetainRate != ''">#{pcRetainRate},</if>
+        <if test="pcRetainMoney != null and pcRetainMoney != ''">#{pcRetainMoney},</if>
+
         <if test="deptId != null and deptId != ''">#{deptId},</if>
         <if test="goodsCategoryId != null">#{goodsCategoryId},</if>
         <if test="categorySort != null">#{categorySort},</if>
+
         <if test="oneRate != null and oneRate != ''">#{oneRate},</if>
         <if test="twoRate != null and twoRate != ''">#{twoRate},</if>
         <if test="threeRate != null and threeRate != ''">#{threeRate},</if>
+
+        <if test="pcOneRate != null and pcOneRate != ''">#{pcOneRate},</if>
+        <if test="pcTwoRate != null and pcTwoRate != ''">#{pcTwoRate},</if>
+        <if test="pcThreeRate != null and pcThreeRate != ''">#{pcThreeRate},</if>
+
         <if test="createBy != null and createBy != ''">#{createBy},</if>
         sysdate()
         )