admin
2021-01-27 e1a62ec62e7331d97af9302e90e1ce44af8235eb
fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java
@@ -286,7 +286,7 @@
            throw new HongBaoException(201, "用户等级为空");
        // 已经失效,已经领取,新老状态一致的红包不做处理
        if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)
        if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU|| oldHongBao.getState() == HongBaoV2.STATE_LINGQUING)
            return false;
        if (type == HongBaoV2.TYPE_ZIGOU) {// 获取自购的返利比例
@@ -309,8 +309,8 @@
            HongBaoV2 hongBao = createFanLiUpdateHongBao(commonOrder, money, hongBaoOrder.getHongBaoV2().getId(),
                    mianDan);
            // 新老红包状态一致不处理
            if (oldHongBao.getState().intValue() == hongBao.getState())
            // 新老红包状态一致且佣金金额不变则不处理
            if (oldHongBao.getState().intValue() == hongBao.getState()&&oldHongBao.getMoney().compareTo(hongBao.getMoney())==0)
                return false;
            if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
@@ -352,7 +352,7 @@
                List<UserTeamLevel> bossList = getBossList(children);
                for (HongBaoV2 child : children) {
                    if (child.getState() == HongBaoV2.STATE_YILINGQU)
                    if (child.getState() == HongBaoV2.STATE_YILINGQU||child.getState() == HongBaoV2.STATE_LINGQUING)
                        continue;
                    if (child.getType() == HongBaoV2.TYPE_YIJI) {
@@ -457,7 +457,7 @@
            if (children != null && children.size() > 0) {
                List<UserTeamLevel> bossList = getBossList(children);
                for (HongBaoV2 child : children) {
                    if (child.getState() == HongBaoV2.STATE_YILINGQU)
                    if (child.getState() == HongBaoV2.STATE_YILINGQU||child.getState() == HongBaoV2.STATE_LINGQUING)
                        continue;
                    if (child.getType() == HongBaoV2.TYPE_SHARE_YIJI) {