Merge remote-tracking branch 'origin/master'

admin

2019-03-04 4b80d2dab78d0cef3d149a0a11240b5e39b581a3

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

@@ -11,6 +11,7 @@
import java.util.Set;



import javax.annotation.Resource;

import javax.servlet.http.HttpSession;



import org.springframework.stereotype.Controller;

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

@@ -31,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;

@@ -48,11 +50,13 @@
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;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;

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



   @Resource

   private MsgOtherDetailService msgOtherDetailService;



   @Resource

   private UserMsgReadStateService userMsgReadStateService;



   @Resource

@@ -102,22 +109,27 @@
   @Resource

   private UserCustomSettingsService userCustomSettingsService;



   @Resource

   private RedisManager redisManager;



   // 消息的类型

   final static String MSG_TYPE_ORDER = "order";

   final static String MSG_TYPE_MONEY = "money";

   final static String MSG_TYPE_ACCOUNT = "account";

   final static String MSG_TYPE_INVITE = "invite";

   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, "用户未登录"));

@@ -162,8 +174,26 @@
         List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);

         count = msgInviteDetailService.countMsgInviteDetail(uid);

         if (detailList3 != null)

            for (MsgInviteDetail detail : detailList3)

               list.add(UserMsgVOFactory.create(detail));

            for (MsgInviteDetail detail : detailList3) {

               UserMsgVO vo = UserMsgVOFactory.create(detail);

               if (vo != null)

                  list.add(vo);

               else

                  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;

      }



@@ -189,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);

@@ -331,7 +382,7 @@
    * @param out

    */

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

   public void getHomeMsgList(AcceptData acceptData, Long uid, int page, PrintWriter out) {

   public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {

      if (uid == null) {

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

         return;

@@ -350,17 +401,30 @@
            }

         }



         if (canAdd) {

            if (hour < 12)

               addRecommendGoods(uid);

            else

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

         String key = "recommend-goods-user-" + uid;

         if (Constant.IS_OUTNET) {

            if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

               if (Constant.IS_OUTNET)

                  redisManager.cacheCommonString(key, "1", 20);

               if (hour < 12)

                  addRecommendGoods(uid);

               else

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

               session.removeAttribute("recommendgoods");

            }

         } else {

            if (canAdd) {

               if (hour < 12)

                  addRecommendGoods(uid);

               else

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

            }

         }

      }



      List<UserHomeMsgVO> volist = new ArrayList<>();

      List<RecommendUserGoods> list = recommendUserGoodsService.listRecommend(uid, page, Constant.PAGE_SIZE);

      long count = recommendUserGoodsService.countRecommend(uid) + 1;// 计算欢迎语的数量

      long count = recommendUserGoodsService.countRecommend(uid);//



      Date now = new Date();

      for (RecommendUserGoods goods : list) {

@@ -403,14 +467,21 @@
         volist.add(vo);

      }



      Long time = userInfoService.selectByPKey(uid).getCreatetime();

      if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))

         count++;// 计算欢迎语的数量



      if (volist.size() > 0 && volist.size() < Constant.PAGE_SIZE) {

         // 添加欢迎语

         UserHomeMsgVO vo = new UserHomeMsgVO();

         vo.setContent("恭喜你，成为返利券的用户\n独家优惠券帮你省钱；\n参与奖金活动帮你赚钱；\n让返利券成为你的省钱助手吧！");

         vo.setTitle("新人欢迎");

         vo.setCreateTime(getTimeDesc(now, new Date(userInfoService.getUserById(uid).getCreatetime())));

         vo.setType(UserHomeMsgVO.TYPE_WELCOME);

         volist.add(vo);

         // 创建时间在28号后的才有新人欢迎

         if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd")) {

            UserHomeMsgVO vo = new UserHomeMsgVO();

            vo.setContent("恭喜你，成为返利券的用户\n独家优惠券帮你省钱；\n参与奖金活动帮你赚钱；\n让返利券成为你的省钱助手吧！");

            vo.setTitle("新人欢迎");

            vo.setCreateTime(getTimeDesc(now, new Date(time)));

            vo.setType(UserHomeMsgVO.TYPE_WELCOME);

            volist.add(vo);

         }

      }



      JSONObject root = new JSONObject();

@@ -497,7 +568,15 @@
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

      userMsgReadStateService.setAllMsgRead(uid);



      UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);

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

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

      if (totalNum == 0) {

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

         return;

      } else

         userMsgReadStateService.setAllMsgRead(uid);

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

   }