yujian
2019-12-10 2e9ffc16415f560a1bb7aa2dc576014521869325
维权
1个文件已修改
24 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -262,22 +262,28 @@
        // 订单标识
        order.setSignList(signList);
        boolean rewardOrder = false;
        int type = 1; // 1 常规跳转页面 2弹出选项(奖励券)
        if (rewardSuccess) {
            if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
                rewardOrder = true; // 奖励成功 2.0.2 消失
        boolean rewardOrder = false;
        if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
            if (rewardSuccess) {
                rewardOrder = true; // 以前版本奖励成功 的显示入口
            }
        } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
                && HongBaoV2.STATE_YILINGQU == hongBaoState) { // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单
            if (!userVIPInfoService.isVIP(uid)) { // 非会员可使用奖励券
            // 已到账的返利订单、非会员可使用奖励券
            if (!freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState
                    && !userVIPInfoService.isVIP(uid)) {
                type = 2; 
                rewardOrder = true; 
            }
        } else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
                    && HongBaoV2.STATE_YILINGQU == hongBaoState && !userVIPInfoService.isVIP(uid)) {
             // 有可用的奖励券 、非免单订单 、且已到账的 、返利订单、 非超级会员
            type = 2;
            rewardOrder = true;
        }
        
        // 维权订单 不可使用奖励券
        // 维权订单 不可使用
        Integer orderState = order.getState();
        if(CommonOrder.STATE_WQ == orderState) {
            rewardOrder = false;