富文本框输入版本变化

KKSU

2023-12-21 c9289c6477ea92fce66d191b4b2a41a9bad22b05

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

@@ -109,10 +109,10 @@
//            return new FebsResponse().fail().message("只有【待审核】状态才能提交！");
//        }

        Double bonusPercent = Double.parseDouble(mallTeamLeader.getBonusPercent());
        if(1 <= bonusPercent || 0 > bonusPercent){
            return new FebsResponse().fail().message("请输入合适的百分比小数");
        }
//        Double bonusPercent = Double.parseDouble(mallTeamLeader.getBonusPercent());
//        if(1 <= bonusPercent || 0 > bonusPercent){
//            return new FebsResponse().fail().message("请输入合适的百分比小数");
//        }
        int isOk = mallTeamLeader.getIsOk();
        if(MallTeamLeader.STATE_YES == isOk){
            mallTeamLeader.setState(MallTeamLeader.STATE_YES);
@@ -174,6 +174,7 @@

        Long memberId = adminLeaderAddDto.getMemberId();
        MallMember mallMember = mallMemberMapper.selectById(memberId);
        MallTeamLeader mallTeamLeaderAdd = new MallTeamLeader();
        if(ObjectUtil.isEmpty(mallMember)){
            return new FebsResponse().fail().message("刷新页面重试");
        }
@@ -185,17 +186,39 @@
        if(CollUtil.isNotEmpty(mallTeamLeaderCancel)){
            return new FebsResponse().fail().message("当前用户无法申请");
        }
        Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
        if(1 <= bonusPercent || 0 > bonusPercent){
            return new FebsResponse().fail().message("请输入合适的百分比小数");
        List<MallTeamLeader> mallTeamLeaderNo = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_NO);
        if(CollUtil.isNotEmpty(mallTeamLeaderNo)){
            mallTeamLeaderAdd = mallTeamLeaderNo.get(0);
            if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
                mallTeamLeaderAdd.setName(adminLeaderAddDto.getName());
                mallTeamLeaderAdd.setPhone(adminLeaderAddDto.getPhone());
                mallTeamLeaderAdd.setAddressPic(adminLeaderAddDto.getAddressPic());
                mallTeamLeaderAdd.setAddressArea(adminLeaderAddDto.getAddressArea());
                mallTeamLeaderAdd.setDetailAddress(adminLeaderAddDto.getDetailAddress());
                mallTeamLeaderAdd.setLongitude(adminLeaderAddDto.getLongitude());
                mallTeamLeaderAdd.setLatitude(adminLeaderAddDto.getLatitude());
                mallTeamLeaderAdd.setState(MallTeamLeader.STATE_YES);
                //申请团长默认关闭返利，返利比例为0
                mallTeamLeaderAdd.setProfitSwitch(2);
                mallTeamLeaderAdd.setBonusPercent("0");
                this.baseMapper.updateById(mallTeamLeaderAdd);
            }
        }else{
            MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
            mallTeamLeader.setUniqueCode(mallMember.getInviteId());
            mallTeamLeader.setMemberId(memberId);
            mallTeamLeader.setPhone(mallMember.getPhone());
            mallTeamLeader.setName(mallMember.getName());
            mallTeamLeader.setState(MallTeamLeader.STATE_YES);
            //申请团长默认关闭返利，返利比例为0
            mallTeamLeader.setProfitSwitch(2);
            mallTeamLeader.setBonusPercent("0");
            this.baseMapper.insert(mallTeamLeader);
        }
        MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
        mallTeamLeader.setUniqueCode(mallMember.getInviteId());
        mallTeamLeader.setMemberId(memberId);
        mallTeamLeader.setPhone(mallMember.getPhone());
        mallTeamLeader.setName(mallMember.getName());
        mallTeamLeader.setState(MallTeamLeader.STATE_YES);
        this.baseMapper.insert(mallTeamLeader);
//        Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
//        if(1 <= bonusPercent || 0 > bonusPercent){
//            return new FebsResponse().fail().message("请输入合适的百分比小数");
//        }
        return new FebsResponse().success();
    }

@@ -318,14 +341,20 @@
            mallElectronicFenceAdd.setServiceId(serviceId);
            mallElectronicFenceMapper.insert(mallElectronicFenceAdd);
        }else{
            String fenceUpdate = iMallElectronicFenceService.fenceUpdate(xcxProperties.getGaodeKey(), serviceId,
                    mallElectronicFence.getGid(), mallElectronicFence.getFenceName(),
                    adminLeaderAddFenceDto.getLonglatiarr());
            if("fail".equals(fenceUpdate)){
                return new FebsResponse().fail().message("高德地图更新多边形围栏失败");
            //删除电子围栏
            if(StrUtil.isEmpty(adminLeaderAddFenceDto.getLonglatiarr())){
                iMallElectronicFenceService.fenceDelete(xcxProperties.getGaodeKey(),serviceId,mallElectronicFence.getGid());
                mallElectronicFenceMapper.deleteById(mallElectronicFence.getId());
            }else{
                String fenceUpdate = iMallElectronicFenceService.fenceUpdate(xcxProperties.getGaodeKey(), serviceId,
                        mallElectronicFence.getGid(), mallElectronicFence.getFenceName(),
                        adminLeaderAddFenceDto.getLonglatiarr());
                if("fail".equals(fenceUpdate)){
                    return new FebsResponse().fail().message("高德地图更新多边形围栏失败");
                }
                mallElectronicFence.setLonglatiarr(adminLeaderAddFenceDto.getLonglatiarr());
                mallElectronicFenceMapper.updateById(mallElectronicFence);
            }
            mallElectronicFence.setLonglatiarr(adminLeaderAddFenceDto.getLonglatiarr());
            mallElectronicFenceMapper.updateById(mallElectronicFence);
        }
        return new FebsResponse().success();
    }
@@ -340,10 +369,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();