我的主菜单街，消息角标修改

admin

2019-08-26 804ccacb27d4c4ff4cd8186df0d14ce3415cf7e6

我的主菜单街，消息角标修改

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

@@ -43,6 +43,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;

import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.goods.RecommendUserGoods;

@@ -72,6 +73,7 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.service.inter.push.PushGoodsService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

@@ -154,6 +156,9 @@


    @Resource

    private MsgDeviceReadStateService msgDeviceReadStateService;



    @Resource

    private UserInfoExtraService userInfoExtraService;



    // 消息的类型

    final static String MSG_TYPE_ORDER = "order";

@@ -262,7 +267,7 @@
     * @param uid

     * @param out

     */

    @RequestSerializableByKey(key="#acceptData.device")

    @RequestSerializableByKey(key = "#acceptData.device")

    @RequestMapping(value = "getUnReadMsgCount", method = RequestMethod.POST)

    public void getUnReadMsgCount(AcceptData acceptData, Long uid, PrintWriter out) {

        GsonBuilder androidBuilder = new GsonBuilder().registerTypeAdapter(Integer.class,

@@ -311,7 +316,7 @@
                        "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2, MsgDeviceReadState.TYPE_KEFU);

                data.put("totalCount", totalCount);

            }



            data.put("mineCount", 0);

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

            return;

        }

@@ -333,6 +338,18 @@
            data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));

        }

        data.put("totalCount", totalCount);

        // "我的"选项角标

        int welfareCenterNews = 0;

        if (uid != null) {

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

            if (userInfoExtra != null) {

                if (userInfoExtra.getCouponNews() != null) {

                    welfareCenterNews = userInfoExtra.getCouponNews();

                }

            }

        }



        data.put("mineCount", welfareCenterNews);



        try {

            UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

@@ -637,7 +654,7 @@
     * @param type

     * @param out

     */

    @RequestSerializableByKey(key="#acceptData.device")

    @RequestSerializableByKey(key = "#acceptData.device")

    @RequestMapping(value = "getHomeMsgListNew", method = RequestMethod.POST)

    public void getHomeMsgListNew(AcceptData acceptData, Long uid, PrintWriter out) {

        if (uid != null && uid == 0)