20220902

xiaoyong931011

2022-09-22 d4801f6c6d821c3b1ebd6174498149ee0e0159ee

20220902

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java

@@ -340,10 +340,10 @@
        if(1!=state){
            return new FebsResponse().fail().message("目前还不是团长，无法操作");
        }
        MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
        if(ObjectUtil.isEmpty(mallElectronicFence)){
            return new FebsResponse().fail().message("请先设置配送范围");
        }
//        MallElectronicFence mallElectronicFence = mallElectronicFenceMapper.selectByTeamLeaderCode(mallTeamLeader.getUniqueCode());
//        if(ObjectUtil.isEmpty(mallElectronicFence)){
//            return new FebsResponse().fail().message("请先设置配送范围");
//        }
        mallTeamLeader.setOnlineState(1);
        this.baseMapper.updateById(mallTeamLeader);
        return new FebsResponse().success();

 src/main/resources/application-dev.yml

@@ -22,7 +22,7 @@
          username: db_yyg
          password: yyg123!@#
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://localhost:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
#          username: db_mall
#          password: mall!@#123
#          driver-class-name: com.mysql.cj.jdbc.Driver

 src/main/resources/application-prod.yml

@@ -22,7 +22,7 @@
          username: db_yyg
          password: yyg123!@#
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://localhost:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）

 src/main/resources/application-test.yml

@@ -22,7 +22,7 @@
          username: db_yyg
          password: yyg123!@#
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://localhost:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://121.37.162.173:3306/db_yyg?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）

 src/main/resources/mapper/modules/MallTeamLeaderMapper.xml

@@ -119,6 +119,7 @@
                and ( a.name like CONCAT('%', CONCAT(#{record.query}, '%'))
                    or a.phone like CONCAT('%', CONCAT(#{record.query}, '%'))
                    or a.take_code like CONCAT('%', CONCAT(#{record.query}, '%'))
                    or b.goods_name like CONCAT('%', CONCAT(#{record.query}, '%'))
                    )
            </if>
            <if test="record.status == 4 and record.status != 0">

 src/main/resources/templates/febs/views/modules/leader/addLeader.html

@@ -46,14 +46,14 @@
                <input type="text" name="uniqueCode" lay-verify="required" placeholder="" autocomplete="off" class="layui-input" readonly>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">收益率：</label>
            <div class="layui-input-block">
                <input type="text" name="bonusPercent"
                       lay-verify="text" autocomplete="off" class="layui-input" >
                <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>
            </div>
        </div>
<!--        <div class="layui-form-item">-->
<!--            <label class="layui-form-label febs-form-item-require">收益率：</label>-->
<!--            <div class="layui-input-block">-->
<!--                <input type="text" name="bonusPercent"-->
<!--                       lay-verify="text" autocomplete="off" class="layui-input" >-->
<!--                <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">自提点名称：</label>
            <div class="layui-input-block">

 src/main/resources/templates/febs/views/modules/leader/leaderList.html

@@ -195,8 +195,8 @@
                    {field: 'detailAddress', title: '自提点地址', minWidth: 150,align:'left'},
                    {field: 'totalProfit', title: '收益', minWidth: 150,align:'left'},
                    {field: 'onlineState', title: '在线状态', templet: '#onlineStateSwitch', minWidth: 100,align:'center'},
                    {field: 'profitSwitch', title: '是否返利', templet: '#profitSwitch', minWidth: 100,align:'center'},
                    {field: 'bonusPercent', title: '返利比例', minWidth: 150,align:'left'},
                    // {field: 'profitSwitch', title: '是否返利', templet: '#profitSwitch', minWidth: 100,align:'center'},
                    // {field: 'bonusPercent', title: '返利比例', minWidth: 150,align:'left'},
                    // {field: 'phone', title: '电话', minWidth: 150,align:'left'},
                    {field: 'state', title: '状态',
                        templet: function (d) {

 src/main/resources/templates/febs/views/modules/leader/leaderUpdate.html

@@ -44,14 +44,14 @@
                <input type="text" name="phone" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">收益率：</label>
            <div class="layui-input-block">
                <input type="text" name="bonusPercent"
                       lay-verify="text" autocomplete="off" class="layui-input" >
                <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>
            </div>
        </div>
<!--        <div class="layui-form-item">-->
<!--            <label class="layui-form-label febs-form-item-require">收益率：</label>-->
<!--            <div class="layui-input-block">-->
<!--                <input type="text" name="bonusPercent"-->
<!--                       lay-verify="text" autocomplete="off" class="layui-input" >-->
<!--                <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">详细地址：</label>
            <div class="layui-input-block">
@@ -219,7 +219,7 @@
                "addressArea": leaderInfo.addressArea,
                "detailAddress": leaderInfo.detailAddress,
                "longitude": leaderInfo.longitude,
                "bonusPercent": leaderInfo.bonusPercent,
                // "bonusPercent": leaderInfo.bonusPercent,
                "latitude": leaderInfo.latitude
            });
        }

 src/main/resources/templates/febs/views/modules/order/orderList.html

@@ -200,6 +200,7 @@
                    return;
                }
                window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&takeUniqueCode="+uniqueCodeValue;
                $query.click();
            }

            if (event == 'exportDeliverTwo') {