20220902

xiaoyong931011

2022-09-29 294ac0a5a3e27dd95a2f9edd5cb5fd5ab4279fda

20220902

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

@@ -189,18 +189,20 @@
        List<MallTeamLeader> mallTeamLeaderNo = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_NO);
        if(CollUtil.isNotEmpty(mallTeamLeaderNo)){
            mallTeamLeaderAdd = mallTeamLeaderNo.get(0);
        }
//        Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
//        if(1 <= bonusPercent || 0 > bonusPercent){
//            return new FebsResponse().fail().message("请输入合适的百分比小数");
//        }
        if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
            mallTeamLeaderAdd = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
            mallTeamLeaderAdd.setState(MallTeamLeader.STATE_YES);
            //申请团长默认关闭返利，返利比例为0
            mallTeamLeaderAdd.setProfitSwitch(2);
            mallTeamLeaderAdd.setBonusPercent("0");
            this.baseMapper.updateById(mallTeamLeaderAdd);
            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());
@@ -213,6 +215,10 @@
            mallTeamLeader.setBonusPercent("0");
            this.baseMapper.insert(mallTeamLeader);
        }
//        Double bonusPercent = Double.parseDouble(adminLeaderAddDto.getBonusPercent());
//        if(1 <= bonusPercent || 0 > bonusPercent){
//            return new FebsResponse().fail().message("请输入合适的百分比小数");
//        }
        return new FebsResponse().success();
    }


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

@@ -83,14 +83,20 @@
        List<MallTeamLeader> mallTeamLeaderNo = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_NO);
        if(CollUtil.isNotEmpty(mallTeamLeaderNo)){
            mallTeamLeaderAdd = mallTeamLeaderNo.get(0);
        }
        if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
            mallTeamLeaderAdd = MallTeamLeaderConversion.INSTANCE.dtoToEntity(apiApplayLeaderDto);
            mallTeamLeaderAdd.setState(MallTeamLeader.STATE_ING);
            //申请团长默认关闭返利，返利比例为0
            mallTeamLeaderAdd.setProfitSwitch(2);
            mallTeamLeaderAdd.setBonusPercent("0");
            this.baseMapper.updateById(mallTeamLeaderAdd);
            if(ObjectUtil.isNotEmpty(mallTeamLeaderAdd)){
                mallTeamLeaderAdd.setName(apiApplayLeaderDto.getName());
                mallTeamLeaderAdd.setPhone(apiApplayLeaderDto.getPhone());
                mallTeamLeaderAdd.setAddressPic(apiApplayLeaderDto.getAddressPic());
                mallTeamLeaderAdd.setAddressArea(apiApplayLeaderDto.getAddressArea());
                mallTeamLeaderAdd.setDetailAddress(apiApplayLeaderDto.getDetailAddress());
                mallTeamLeaderAdd.setLongitude(apiApplayLeaderDto.getLongitude());
                mallTeamLeaderAdd.setLatitude(apiApplayLeaderDto.getLatitude());
                mallTeamLeaderAdd.setState(MallTeamLeader.STATE_ING);
                //申请团长默认关闭返利，返利比例为0
                mallTeamLeaderAdd.setProfitSwitch(2);
                mallTeamLeaderAdd.setBonusPercent("0");
                this.baseMapper.updateById(mallTeamLeaderAdd);
            }
        }else{
            MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.dtoToEntity(apiApplayLeaderDto);
            mallTeamLeader.setMemberId(memberId);