xuhy
2023-06-07 81dcb037f2ee0e19ebb2abd7234ddf0f117f2c10
抽佣分成修改
4个文件已修改
47 ■■■■■ 已修改文件
management/guns-admin/src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/resources/redis.properties 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
management/guns-admin/src/main/resources/application.yml
@@ -59,8 +59,8 @@
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
    username: root
#    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
    password: 123456
    password: f4OfRjqoN3jSiNGiUoiNsQdOBtCOKYRj
#    password: 123456
    db-name: super_save_driving #用来搜集数据库的所有表
    filters: wall,mergeStat
management/guns-admin/src/main/resources/redis.properties
@@ -3,18 +3,18 @@
spring.redis.database=0
## Redis·þÎñÆ÷µØÖ·
#spring.redis.host=127.0.0.1
### Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
#spring.redis.port=16379
### Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
#spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
spring.redis.host=127.0.0.1
## Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=16379
## Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
# Redis·þÎñÆ÷µØÖ·
spring.redis.host=127.0.0.1
# Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
spring.redis.port=6379
# Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
spring.redis.password=123456
#spring.redis.host=127.0.0.1
## Redis·þÎñÆ÷Á¬½Ó¶Ë¿Ú
#spring.redis.port=6379
## Redis·þÎñÆ÷Á¬½ÓÃÜÂ루ĬÈÏΪ¿Õ£©
#spring.redis.password=123456
# Á¬½Ó³Ø×î´óÁ¬½ÓÊý£¨Ê¹ÓøºÖµ±íʾûÓÐÏÞÖÆ£©
spring.redis.jedis.pool.max-active=1024
management/guns-admin/src/main/webapp/WEB-INF/view/system/tSystemConfig/tSystemConfigCommissionShareRules.html
@@ -15,37 +15,37 @@
                            </div>
                        </div>
                        <!--<div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <span class="control-label" >司机邀请1名用户,下单后完成订单后获得</span>
                                <input class="control-label" id="num1" name="num1" value="${num1}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单</span>
                            </div>
                        </div>-->
                        </div>
                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <span class="control-label" >司机A邀请1名司机B,完成有效单后获得</span>
                                <input class="control-label" id="num1" name="num1" value="${num1}" type="text" min="0" style="height: 30px;width: 80px">
                                <input class="control-label" id="num2" name="num2" value="${num2}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单</span>
                            </div>
                        </div>
                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <span class="control-label" >司机B邀请1名司机C,完成有效单后B获得</span>
                                <input class="control-label" id="num2" name="num2" value="${num2}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单&nbsp;司机A获得</span>
                                <input class="control-label" id="num3" name="num3" value="${num3}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单&nbsp;司机A获得</span>
                                <input class="control-label" id="num4" name="num4" value="${num4}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单</span>
                            </div>
                        </div>
                        <div class="initialLevel col-sm-12 control-label form-group" style="text-align: left" >
                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <span class="control-label" >司机C邀请1名司机D,完成有效单后C获得</span>
                                <input class="control-label" id="num4" name="num4" value="${num4}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单&nbsp;司机B获得</span>
                                <input class="control-label" id="num5" name="num5" value="${num5}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单&nbsp;司机A获得</span>
                                <span class="control-label" >元/单&nbsp;司机B获得</span>
                                <input class="control-label" id="num6" name="num6" value="${num6}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单&nbsp;司机A获得</span>
                                <input class="control-label" id="num7" name="num7" value="${num7}" type="text" min="0" style="height: 30px;width: 80px">
                                <span class="control-label" >元/单</span>
                            </div>
                        </div>
@@ -90,8 +90,12 @@
        var value = $(this).val()
        regexp(value)
    })
    $("input[name=num7]").mouseleave('input',function(){
        var value = $(this).val()
        regexp(value)
    })
    function regexp(value){
        var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数
        var reg=/^(\d+.?)?\d{0,2}$/;//由 1-9开头 的正则表达式 整数 两位小数
        var reg1 = /^(([1-9]{1}\d*)|(0{1}))(\.\d{2})$/; // 两位小数
        //先判断是否为整数 在判断 是否在 1-总页  整数范围之内
        if(reg.test(value)){
management/guns-admin/src/main/webapp/static/modular/system/tSystemConfig/tSystemConfig.js
@@ -120,6 +120,7 @@
    reqData['num4'] = $("#num4").val();
    reqData['num5'] = $("#num5").val();
    reqData['num6'] = $("#num6").val();
    reqData['num7'] = $("#num7").val();
    console.log(JSON.stringify(reqData))
    ajax.set("content",JSON.stringify(reqData));
    ajax.set("type",2);