公告-首页公告调整

KKSU

2024-04-10 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a

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

@@ -385,11 +385,11 @@
        moneyFlowDto.setMemberId(id);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);

//        if (moneyFlowDto.getFlowType() == 3) {
//            pages.getRecords().forEach(item -> {
//                item.setDescription(ScoreFlowTypeEnum.getDescByValue(item.getType()));
//            });
//        }
        if (moneyFlowDto.getFlowType() == 3) {
            pages.getRecords().forEach(item -> {
                item.setDescription(ScoreFlowTypeEnum.getDescByValue(item.getType()));
            });
        }
        return new FebsResponse().success().data(pages);
    }

@@ -622,7 +622,6 @@
                    mallMember = new MallMember();
                    mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
                    mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
                    mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
                    mallMember.setOpenId(openId);
                    mallMember.setSessionKey(sessionKey);

@@ -726,7 +725,7 @@
        }

        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();
        if (CollUtil.isNotEmpty(configs)) {
        if (StrUtil.isBlank(mallMember.getLevel()) && CollUtil.isNotEmpty(configs)) {
            MallVipConfig mallVipConfig = configs.get(0);
            mallMember.setLevel(mallVipConfig.getCode());
        }
@@ -751,7 +750,6 @@
                    mallMember.setPhone(phone);
                    mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
                    mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
                    mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
                    this.baseMapper.insert(mallMember);

                    String inviteId = ShareCodeUtil.toSerialCode(mallMember.getId());
@@ -1006,7 +1004,10 @@
        Long memberId = LoginUserUtil.getLoginUser().getId();
        mallMemberCouponDto.setMemberId(memberId);
        mallMemberCouponDto.setExpireTime(DateUtil.date());
        List<Long> couponIds = couponGoodsMapper.selectByGoodId(mallMemberCouponDto.getGoodsId());
//        List<Long> couponIds = couponGoodsMapper.selectByGoodId(mallMemberCouponDto.getGoodsId());
        List<Long> goodsIdList = mallMemberCouponDto.getGoodsIdList();
        List<Long> couponIds = couponGoodsMapper.selectByGoodIdList(goodsIdList);

        List<MallMemberCouponVo> mallMemberCouponVos = new ArrayList<>();
        if(CollUtil.isNotEmpty(couponIds)){
            mallMemberCouponVos = mallMemberCouponMapper.selectListCreateInPage(mallMemberCouponDto,couponIds);
@@ -1087,14 +1088,13 @@

        MallMember member = this.baseMapper.selectById(loginUser.getId());

        MallMember mallMember = new MallMember();
        mallMember.setId(member.getId());
        mallMember.setLastLoginTime(new Date());
        this.baseMapper.updateById(mallMember);

        DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.UNALIVE_COUPON.getType(), DataDictionaryEnum.UNALIVE_COUPON.getCode());
        if (dic == null || StrUtil.isBlank(dic.getValue())) {

            MallMember mallMember = new MallMember();
            mallMember.setId(member.getId());
            mallMember.setLastLoginTime(new Date());
            this.baseMapper.updateById(mallMember);

            return new HashMap<>();
        }

@@ -1110,11 +1110,32 @@
        List<Long> couponIds = list.stream().filter(item -> {
            return item.getDay() <= days && item.getCouponId() != null;
        }).map(VipSettingUnAliveSettingBo::getCouponId).collect(Collectors.toList());
        if (CollUtil.isEmpty(couponIds)) {
            return new HashMap<>();
        }

        LambdaQueryWrapper<MallGoodsCoupon> query = new LambdaQueryWrapper<>();
        query.in(MallGoodsCoupon::getId, couponIds)
                .eq(MallGoodsCoupon::getState, 2);
        List<MallGoodsCoupon> coupons = mallGoodsCouponMapper.selectList(query);

        LambdaQueryWrapper<MallMemberCoupon> memberCouponQuery = new LambdaQueryWrapper<>();
        memberCouponQuery.in(MallMemberCoupon::getCouponId, couponIds)
                        .eq(MallMemberCoupon::getMemberId, member.getId())
                        .eq(MallMemberCoupon::getFromType, 3)
                        .ge(MallMemberCoupon::getCreatedTime, DateUtil.beginOfDay(new Date()))
                        .le(MallMemberCoupon::getCreatedTime, DateUtil.endOfDay(new Date()));
        List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList(memberCouponQuery);
        if (CollUtil.isNotEmpty(mallMemberCoupons)) {
            Map<Long, MallMemberCoupon> map = mallMemberCoupons.stream().collect(Collectors.toMap(MallMemberCoupon::getCouponId, MallMemberCoupon -> MallMemberCoupon));
            coupons = coupons.stream().filter(item -> {
                return map.get(item.getId()) == null;
            }).collect(Collectors.toList());
        }

        if (CollUtil.isEmpty(coupons)) {
            return new HashMap<>();
        }

        coupons.forEach(item -> {
            MallMemberCoupon memberCoupon = new MallMemberCoupon();
@@ -1123,15 +1144,11 @@
            memberCoupon.setInviteId(member.getInviteId());
            memberCoupon.setCouponUuid(IdUtil.simpleUUID());
            memberCoupon.setState(1);
            memberCoupon.setFromType(3);
            memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), item.getExpireDay()));
            memberCoupon.setMemberId(member.getId());
            mallMemberCouponMapper.insert(memberCoupon);
        });

        MallMember mallMember = new MallMember();
        mallMember.setId(member.getId());
        mallMember.setLastLoginTime(new Date());
        this.baseMapper.updateById(mallMember);

        Map<String, Object> result = new HashMap<>();
        result.put("coupon", coupons);