首页的邀请控制

admin

2019-01-23 e179d8660bf4837455a38c24e74320143e0d2e17

首页的邀请控制

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -16,7 +16,6 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

import org.yeshi.utils.BigDecimalUtil;

import org.yeshi.utils.IPUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.NumberUtil;

@@ -69,6 +68,7 @@
import com.yeshi.fanli.exception.goods.ScanHistoryException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;

import com.yeshi.fanli.exception.user.UserCustomSettingsException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -99,6 +99,7 @@
import com.yeshi.fanli.service.inter.user.ShamUserService;

import com.yeshi.fanli.service.inter.user.ShareManageService;

import com.yeshi.fanli.service.inter.user.TBPidService;

import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;

import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

@@ -112,6 +113,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

import com.yeshi.fanli.vo.user.UserSettingsVO;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;

@@ -224,6 +226,9 @@


    @Resource

    private JumpDetailV2Service jumpDetailV2Service;



    @Resource

    private UserCustomSettingsService userCustomSettingsService;



    @RequestMapping(value = "getrecommendsection")

    public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {

@@ -1606,7 +1611,8 @@
     * @param out

     */

    @RequestMapping(value = "getNewRecommendInfo")

    public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {

    public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,

            PrintWriter out) {



        System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());

        if (system == null) {

@@ -1717,7 +1723,16 @@
            if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)

                    || ("ios".equalsIgnoreCase(acceptData.getPlatform())

                            && Integer.parseInt(acceptData.getVersion()) > 37)) {

                root.put("invite", invite);

                if (uid != null) {

                    try {

                        UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

                        if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 没有关闭邀请

                            root.put("invite", invite);

                    } catch (UserCustomSettingsException e) {

                        e.printStackTrace();

                    }

                } else

                    root.put("invite", invite);

            }

        }




 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java

@@ -195,7 +195,7 @@


        try {

            UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

            if (vo != null && vo.getNoNewsRedDot() == 1) {

            if (vo != null && vo.getNoNewsRedDot() != null && vo.getNoNewsRedDot() == 1) {

                data.put("totalCount", 0);

            }

        } catch (UserCustomSettingsException e) {

@@ -414,8 +414,7 @@
            UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);

            if (usm != null)

                root.put("systemMsg",

                        new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "系统消息",

                                usm.getTitle(),

                        new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "系统消息", usm.getTitle(),

                                usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",

                                "http://img.flqapp.com/resource/msg/icon_msg_system.png",

                                getTimeDesc(now, usm.getCreateTime()), num.getTypeSystem()));