取消邀请码发布 邀请码激活

yj

2020-03-09 0d22020f783fca5c96935512154fd1f91661d434

取消邀请码发布 邀请码激活

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -35,6 +35,7 @@
import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.integral.CodePublishRecord;

import com.yeshi.fanli.entity.integral.IntegralExchange;

import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum;

import com.yeshi.fanli.entity.integral.IntegralTask;

import com.yeshi.fanli.entity.integral.IntegralTask.TaskUniqueKeyEnum;

import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;

@@ -59,6 +60,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.vo.integral.DailySignVO;

import com.yeshi.fanli.vo.integral.ExchangeTipVO;

@@ -378,8 +380,22 @@


        List<IntegralExchange> list = integralExchangeRecordService.listExchange((page - 1) * Constant.PAGE_SIZE,

                Constant.PAGE_SIZE, uid);

        if (list == null)

            list = new ArrayList<IntegralExchange>();

		
        List<IntegralExchange> listNew = new ArrayList<>();

        if (list != null)

            listNew.addAll(list);

		
        if (VersionUtil.greaterThan_2_0_7(acceptData.getPlatform(), acceptData.getVersion())) {

            for (int i=0; i < listNew.size(); i ++) {

                IntegralExchange integralExchange = listNew.get(i);

                ExchangeTypeEnum type = integralExchange.getType();

                if (type != null &&

                        (type == ExchangeTypeEnum.inviteCodeActivate || type == ExchangeTypeEnum.inviteCodePublish)) {

                    listNew.remove(i);

                    i--;

                }

            }

        }



        // Long count = integralExchangeService.countValid();



@@ -388,8 +404,8 @@


        JSONObject data = new JSONObject();

        data.put("goldCoin", extraVO.getGoldCoin() + "枚");

        data.put("count", list.size());

        data.put("list", gson.toJson(list));

        data.put("count", listNew.size());

        data.put("list", gson.toJson(listNew));

        out.print(JsonUtil.loadTrueResult(data));

    }