消息修改

admin

2019-02-28 f51cf41d12635b59c2d6ee33685e82fe3d5751b3

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

@@ -32,6 +32,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;

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

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

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.goods.CommonGoods;

@@ -49,6 +50,7 @@
import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;

import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;

import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;

import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;

import com.yeshi.fanli.service.inter.msg.UserSystemMsgService;

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

@@ -84,6 +86,9 @@
   private MsgAccountDetailService msgAccountDetailService;



   @Resource

   private MsgOtherDetailService msgOtherDetailService;



   @Resource

   private UserMsgReadStateService userMsgReadStateService;



   @Resource

@@ -115,15 +120,16 @@
   final static String MSG_TYPE_OTHER = "other";



   /**

    * 获取订单消息列表

    * 获取消息列表

    * 

    * @param acceptData

    * @param uid

    * @param page

    * @param type

    * @param out

    */

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

   public void getOrderMsgList(AcceptData acceptData, Long uid, int page, String type, PrintWriter out) {

   public void getMsgList(AcceptData acceptData, Long uid, int page, String type, PrintWriter out) {



      if (uid == null) {

         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

@@ -176,6 +182,19 @@
                  count--;

            }

         break;

      case MSG_TYPE_OTHER:

         userMsgReadStateService.readOtherMsg(uid);

         List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);

         count = msgOtherDetailService.countMsgOtherDetail(uid);

         if (detailList4 != null)

            for (MsgOtherDetail detail : detailList4) {

               UserMsgVO vo = UserMsgVOFactory.create(detail);

               if (vo != null)

                  list.add(vo);

               else

                  count--;

            }

         break;

      }



      GsonBuilder builder = new GsonBuilder();

@@ -200,9 +219,30 @@
         return;

      }

      UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);

      JSONObject data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));

      data.put("totalCount", num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()

            + num.getTypeScore() + num.getTypeSystem());



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

            new JsonSerializer<Integer>() {

               @Override

               public JsonElement serialize(Integer value, Type theType, JsonSerializationContext context) {

                  if (value == null) {

                     return new JsonPrimitive("0");

                  } else {

                     if (value >= 100)

                        return new JsonPrimitive("99+");

                     else

                        return new JsonPrimitive(value);

                  }

               }

            });

      int totalCount = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()

            + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();

      JSONObject data = null;

      if ("android".equalsIgnoreCase(acceptData.getPlatform())) {

         data = JSONObject.fromObject(androidBuilder.excludeFieldsWithoutExposeAnnotation().create().toJson(num));

      } else {

         data = JSONObject.fromObject(JsonUtil.getApiCommonGson().toJson(num));

      }

      data.put("totalCount", totalCount);



      try {

         UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);

@@ -373,10 +413,12 @@
               session.removeAttribute("recommendgoods");

            }

         } else {

            if (hour < 12)

               addRecommendGoods(uid);

            else

               addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());

            if (canAdd) {

               if (hour < 12)

                  addRecommendGoods(uid);

               else

                  addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());

            }

         }

      }



@@ -529,7 +571,7 @@


      UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);

      int totalNum = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()

            + num.getTypeScore() + num.getTypeSystem();

            + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();

      if (totalNum == 0) {

         out.print(JsonUtil.loadFalseResult(1, "没有未读消息"));

         return;