202107016

xiaoyong931011

2021-07-16 d1068115eccec5ab657f3fcfd6750bb4028eda80

 gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java

@@ -78,7 +78,7 @@
                    viewSettingVo.setRegularPoint(StrUtil.isEmpty(shareRatios.get(2))?0:Integer.parseInt(shareRatios.get(2)));
                    viewSettingVo.setRegularMoneyPercent(StrUtil.isEmpty(shareRatios.get(3))?BigDecimal.ZERO:new BigDecimal(shareRatios.get(3)));
//                    viewSettingVo.setFinishOrderNum(StrUtil.isEmpty(shareRatios.get(4))?0:Integer.parseInt(shareRatios.get(4)));
                    viewSettingVo.setPointReward(StrUtil.isEmpty(shareRatios.get(5))?0:Integer.parseInt(shareRatios.get(5)));
                    viewSettingVo.setPointReward(StrUtil.isEmpty(shareRatios.get(4))?0:Integer.parseInt(shareRatios.get(4)));
                    viewSettingVo.setStatus(redPaperRule.getStatus());
                }
            }else{
@@ -113,6 +113,10 @@
        }

        AccountInfo accountInfo = accountMapper.selectOneByUserId(userId);
        if (AccountInfo.IS_HEAD_Y.equals(accountInfo.getIsHead())) {
            throw new RestException(-3, "团长不能加入团队");
        }

        UserShareInfo userShareInfo = userShareInfoMapper.selectByRegistPhone(accountInfo.getAccountName());
        if (userShareInfo != null) {
            throw new RestException(-3, "您已与推广员绑定, 无法加入");
@@ -133,7 +137,7 @@
        sysMessage.setMobilePhone(accountInfo.getAccountName());
        sysMessage.setMessageType("4");
        sysMessage.setMessageSubTypeName("团队消息");
        sysMessage.setMessage("手机号:" + accountInfo.getAccountName() + "的用户, 成功加入您的团队");
        sysMessage.setMessage("手机号:" + accountInfo.getAccountName().replaceAll("(\\w{3})\\w*(\\w{4})", "$1****$2") + "的用户, 成功加入您的团队");
        sysMessage.setFlag("2");
        sysMessageMapper.insert(sysMessage);
    }
@@ -177,7 +181,7 @@
        stringBuffer.append(pointReward);
        redPaperRule.setStatus((short) 0);
        redPaperRule.setRuleName("分销规则");
        redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,finish_order_num,point_reward");
        redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,point_reward");
        redPaperRule.setShareRatio(stringBuffer.toString());
        redPaperRuleMapper.insert(redPaperRule);
    }
@@ -199,7 +203,7 @@
            int pointReward = ObjectUtil.isEmpty(model.getPointReward()) ? 0 : model.getPointReward();
            stringBuffer.append(pointReward);
            redPaperRule.setStatus(model.getStatus());
            redPaperRule.setSharingProfitType("first_reward,order_num_first,regular_point,regular_money_percent,finish_order_num,point_reward");
            redPaperRule.setSharingProfitType("first_reward,order_num_first,regular_point,regular_money_percent,point_reward");
            redPaperRule.setShareRatio(stringBuffer.toString());
            redPaperRuleMapper.updateByPrimaryKey(redPaperRule);
        }
@@ -262,6 +266,11 @@

    public ViewDistribInfoVo viewDistribInfo(String id) {
        //获取团长基本信息
        ViewDistribInfoVo viewDistribInfoVo = accountMapper.selectDistribByAccountId(id);
        if(StrUtil.isNotEmpty(viewDistribInfoVo.getNickname())){
            String decode = StringUtils.decode(viewDistribInfoVo.getNickname());
            viewDistribInfoVo.setNickname(decode);
        }
        return accountMapper.selectDistribByAccountId(id);
    }

@@ -296,6 +305,9 @@
        if(CollUtil.isNotEmpty(orderItemsVos)){
            for(OrderItemsVo orderItemsVo : orderItemsVos){
                if(ObjectUtil.isNotEmpty(orderItemsVo)){
                    String nickname = orderItemsVo.getNickname();
                    String decode = StringUtils.decode(nickname);
                    orderItemsVo.setNickname(decode);
                    Long orderId = orderItemsVo.getOrderId();
                    List<JhyOrderItems> jhyOrderItems = accountMapper.selectOrderById(orderId);
                    if(CollUtil.isNotEmpty(jhyOrderItems)){
@@ -323,11 +335,24 @@


    public Map<String, Object> distribDataList(DistribDataListDto distribDataListDto) {
        if(StrUtil.isNotEmpty(distribDataListDto.getQueryCol())){
            String decode = StringUtils.encode(distribDataListDto.getQueryCol());
            distribDataListDto.setName(decode);
            distribDataListDto.setPhone(distribDataListDto.getQueryCol());
        }
        PageHelper.startPage(distribDataListDto.getPage(), distribDataListDto.getLimit());
        List<DistribDataListVo> distribDataListVos = accountMapper.distribDataList(distribDataListDto);
        if(CollUtil.isNotEmpty(distribDataListVos)){
            for(DistribDataListVo distribDataListVo : distribDataListVos){
                if(ObjectUtil.isNotEmpty(distribDataListVo)){
                    String nickname = distribDataListVo.getNickname();
                    String decode = StringUtils.decode(nickname);
                    distribDataListVo.setNickname(decode);
                    String id = distribDataListVo.getId();
                    String kg = accountMapper.selectOrderByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setKg(kg);
                    String jdsl = accountMapper.selectJDSLByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setJdsl(jdsl);
                }
            }
        }
@@ -339,4 +364,39 @@
        data.put("code", 0);
        return data;
    }

    public DistribDataInfoVo distribDataInfo(DistribDataInfoDto distribDataInfoDto) {
        return accountMapper.selectDistribDataInfoVo();
    }

    public Map<String, Object> distribDataExport(ExportDistribDataListDto distribDataListDto) {
        if(StrUtil.isNotEmpty(distribDataListDto.getQueryCol())){
            String decode = StringUtils.encode(distribDataListDto.getQueryCol());
            distribDataListDto.setName(decode);
            distribDataListDto.setPhone(distribDataListDto.getQueryCol());
        }
        List<DistribDataListVo> distribDataListVos = accountMapper.distribDataExport(distribDataListDto);
        if(CollUtil.isNotEmpty(distribDataListVos)){
            for(DistribDataListVo distribDataListVo : distribDataListVos){
                if(ObjectUtil.isNotEmpty(distribDataListVo)){
                    String nickname = distribDataListVo.getNickname();
                    String decode = StringUtils.decode(nickname);
                    distribDataListVo.setNickname(decode);
                    String id = distribDataListVo.getId();
                    String kg = accountMapper.selectOrderExportByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setKg(kg);
                    String jdsl = accountMapper.selectJDSLExportByHeadUserId(id,distribDataListDto);
                    distribDataListVo.setJdsl(jdsl);
                }
            }
        }
        PageInfo<DistribDataListVo> pageInfo = new PageInfo<>(distribDataListVos);
        Map<String, Object> data = new HashMap<>();
        int count = Convert.toInt(pageInfo.getTotal());
        data.put("data", distribDataListVos);
        data.put("count", count);
        data.put("code", 0);
        return data;
    }

}