fwq
2024-02-29 b2fc091877f56a16cf6cd1aec074ddf84437e397
phi_platform_user/src/main/java/com/hx/phip/service/userMoney/impl/UserMoneyUnclaimedServiceImpl.java
@@ -780,15 +780,13 @@
                Date limitEndTime = null;
                //有限制时间规则
                if (StringUtils.noNull(userMoneyUnclaimed.getMoneyRuleId())){
                    //有领取限制
                    if (userMoneyUnclaimed.getReceiveMoneyLimit() != null && userMoneyUnclaimed.getReceiveMoneyLimit().equals(BaseEntity.YES)){
                        //要领取的资金判断是否满足条件
                        if (UserMoneyUnclaimed.OP_TYPE_RECEIVE == userMoneyUnclaimed.getOpType() && checkCanNotReceive(userMoneyUnclaimed)){
                            throw new PlatTipsException(PlatformCode.ERROR_TIPS,"领取失败,未满足领取条件");
                        }
                    //需要领取,有领取限制 则校验是否满足条件
                    if (userMoneyUnclaimed.getReceiveMoneyLimit() != null && userMoneyUnclaimed.getReceiveMoneyLimit().equals(BaseEntity.YES)
                            && UserMoneyUnclaimed.OP_TYPE_RECEIVE == userMoneyUnclaimed.getOpType() && checkCanNotReceive(userMoneyUnclaimed)){
                        throw new PlatTipsException(PlatformCode.ERROR_TIPS,"领取失败,未满足领取条件");
                    }
                    //有领取后的时间限制,限制结束时间计算
                    if (userMoneyUnclaimed.getReceiveMoneyLimit() != null && userMoneyUnclaimed.getReceiveMoneyLimit().equals(BaseEntity.YES)){
                        //有限制,限制结束时间计算
                        logger.info("操作待领取资金-关联规则限制有效天数{},数据id:{}",userMoneyUnclaimed.getId(),userMoneyUnclaimed.getReceiveMoneyLimitDay());
                        limitEndTime = DateUtil.addDay(userMoneyUnclaimed.getLimitStartTime(),userMoneyUnclaimed.getReceiveMoneyLimitDay());
                    }else {