修改bug

puzhibing

4 天以前 0b9e60f0bada4cc39187a9dd3c36bf37452f63de

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -435,12 +435,36 @@
        //今日到店用户
        if(null != merMemberPageDto.getIsTodayStore() && 1 == merMemberPageDto.getIsTodayStore()){
            List<Integer> data = remoteOrderService.countShopServicePerson(merMemberPageDto.getShopId()).getData();
            if(data.isEmpty()){
                data.add(-1);
            }
            merMemberPageDto.setUserIds(data);
        }
        //有未跟进的任务用户
        if(null != merMemberPageDto.getIsTask() && 1 == merMemberPageDto.getIsTask()){
            List<Integer> data = remoteShopService.getMemberIngTotal(merMemberPageDto.getShopId()).getData();
            if(data.isEmpty()){
                data.add(-1);
            }
            merMemberPageDto.setUserIds(data);
        }
        //剩余周期人数
        if(null != merMemberPageDto.getResiduePeriod() && 1 == merMemberPageDto.getResiduePeriod()){
            Set<Long> data = remoteOrderService.getConsumerGoodsResidueUserId(merMemberPageDto.getShopId(), 1).getData();
            List<Integer> collect = data.stream().map(s -> Integer.valueOf(s.intValue())).collect(Collectors.toList());
            if(collect.isEmpty()){
                collect.add(-1);
            }
            merMemberPageDto.setUserIds(collect);
        }
        //剩余体验人数
        if(null != merMemberPageDto.getResidueExperience() && 1 == merMemberPageDto.getResidueExperience()){
            Set<Long> data = remoteOrderService.getConsumerGoodsResidueUserId(merMemberPageDto.getShopId(), 3).getData();
            List<Integer> collect = data.stream().map(s -> Integer.valueOf(s.intValue())).collect(Collectors.toList());
            if(collect.isEmpty()){
                collect.add(-1);
            }
            merMemberPageDto.setUserIds(collect);
        }
        List<MerMemberPageVo> merMemberPageVoList = memberMapper.pageMerMember(page, merMemberPageDto);
        //处理活跃度返回
@@ -2182,7 +2206,7 @@
        integralRecord.setUserId(integralChangeDto.getUserId());
        integralRecord.setChangeType(integralType);
        integralRecord.setCreateTime(new Date());
        //1分享获取2平台建议获取3门店建议获取4每日签到5消费得积分
        //1分享获取2平台建议获取3门店建议获取4每日签到5消费得积分6抽奖获得积分
        switch(integralType){
            case 1:
                changeIntegral = appOtherConfigGetVo.getShareIntegral();
@@ -2224,6 +2248,16 @@
                integralRecord.setChangeIntegral(changeIntegral);
                integralRecord.setSurpIntegral(memberTotal.getUseableIntegral()+changeIntegral);
                integralRecord.setChangeReason("订单【"+integralChangeDto.getOrderNo()+"】获得积分");
                integralRecord.setOrderId(integralChangeDto.getOrderId());
                integralRecord.setOrderNo(integralChangeDto.getOrderNo());
                memberTotal.setTotalIntegral(memberTotal.getTotalIntegral()+changeIntegral);
                memberTotal.setUseableIntegral(memberTotal.getUseableIntegral()+changeIntegral);
                memberTotal.setBuyFlag(1);
                break;
            case 6:
                integralRecord.setChangeIntegral(changeIntegral);
                integralRecord.setSurpIntegral(memberTotal.getUseableIntegral()+changeIntegral);
                integralRecord.setChangeReason("抽奖获得积分");
                integralRecord.setOrderId(integralChangeDto.getOrderId());
                integralRecord.setOrderNo(integralChangeDto.getOrderNo());
                memberTotal.setTotalIntegral(memberTotal.getTotalIntegral()+changeIntegral);
@@ -2324,9 +2358,8 @@
            File file = wxMaService.getQrcodeService().createWxaCodeUnlimit(scene, path);
            FileInputStream input = new FileInputStream(file);
            MultipartFile multipartFile = new MyMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
            
            SysFile sysFile = remoteFileService.upload(multipartFile).getData();
            return sysFile.getUrl();
            String data = remoteFileService.uploadOSS(multipartFile).getData();
            return data;
        } catch (Exception e) {
            e.printStackTrace();
        }