yujian
2019-03-27 cdcbed9af813b2a02cdc01eefa24db8bec6b51a9
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -295,7 +295,7 @@
      return builder;
   }
   private void addRecommendGoods(Long uid, String imei, String idfa) {
   private void addRecommendGoods(Long uid, String device, String imei, String idfa) {
      TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(1, 50, imei, idfa);
      if (result != null && result.getTaoBaoGoodsBriefs() != null) {
         for (int i = 0; i < result.getTaoBaoGoodsBriefs().size(); i++) {
@@ -326,7 +326,7 @@
               }
            }
            try {
               recommendUserGoodsService.addRecommend(uid, "", goodsList);
               recommendUserGoodsService.addRecommend(uid, device, "", goodsList);
            } catch (RecommendUserGoodsException e) {
               e.printStackTrace();
            }
@@ -334,7 +334,7 @@
      }
   }
   private void addRecommendGoods(Long uid) {
   private void addRecommendGoods(Long uid, String device) {
      List<QualityFactory> qfList = qualityFactoryService.listByMinSalesCountOrderByCreateTimeDesc(10000, 1, 20);
      if (qfList != null && qfList != null) {
         for (int i = 0; i < qfList.size(); i++) {
@@ -365,7 +365,7 @@
               }
            }
            try {
               recommendUserGoodsService.addRecommend(uid, "", goodsList);
               recommendUserGoodsService.addRecommend(uid, device, "", goodsList);
            } catch (RecommendUserGoodsException e) {
               e.printStackTrace();
            }
@@ -383,15 +383,21 @@
    */
   @RequestMapping(value = "getHomeMsgList", method = RequestMethod.POST)
   public void getHomeMsgList(AcceptData acceptData, Long uid, int page, HttpSession session, PrintWriter out) {
      if (uid == null) {
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));
      String device = acceptData.getDevice();
      if (device == null || device.trim().length() == 0) {
         out.print(JsonUtil.loadFalseResult("设备号不能为空"));
         return;
      }
      if (page == 1) {
         if (uid != null)
            recommendUserGoodsService.syncDeviceAndUid(uid, acceptData.getDevice());
         boolean canAdd = false;
         int hour = Calendar.getInstance().get(Calendar.HOUR);
         RecommendUserGoods goods = recommendUserGoodsService.getLatestRecommendUserGoods(uid);
         RecommendUserGoods goods = recommendUserGoodsService.getLatestRecommendUserGoodsByDevice(device);
         if (goods == null) {
            canAdd = true;
         } else {
@@ -401,30 +407,33 @@
            }
         }
         String key = "recommend-goods-user-" + uid;
         // String key = "recommend-goods-user-" + uid;
         String key = "recommend-goods-user-" + device;
         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);
                  addRecommendGoods(uid, device);
               else
                  addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
                  addRecommendGoods(uid, device, acceptData.getImei(), acceptData.getIdfa());
               session.removeAttribute("recommendgoods");
            }
         } else {
            if (canAdd) {
               if (hour < 12)
                  addRecommendGoods(uid);
                  addRecommendGoods(uid, device);
               else
                  addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
                  addRecommendGoods(uid, device, acceptData.getImei(), acceptData.getIdfa());
            }
         }
      }
      List<UserHomeMsgVO> volist = new ArrayList<>();
      List<RecommendUserGoods> list = recommendUserGoodsService.listRecommend(uid, page, Constant.PAGE_SIZE);
      long count = recommendUserGoodsService.countRecommend(uid);//
      List<RecommendUserGoods> list = recommendUserGoodsService.listRecommendGoodsByDevice(device, page,
            Constant.PAGE_SIZE);
      long count = recommendUserGoodsService.countRecommendGoodsByDevice(device);
      Date now = new Date();
      for (RecommendUserGoods goods : list) {
@@ -467,26 +476,25 @@
         volist.add(vo);
      }
      Long time = userInfoService.selectByPKey(uid).getCreatetime();
      if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))
         count++;// 计算欢迎语的数量
      Long time = (uid == null ? System.currentTimeMillis() : userInfoService.selectByPKey(uid).getCreatetime());
      if (volist.size() > 0 && volist.size() < Constant.PAGE_SIZE) {
         // 添加欢迎语
         // 创建时间在28号后的才有新人欢迎
         if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd")) {
         if ((time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd") || uid == null)) {
            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);
            count++;
         }
      }
      JSONObject root = new JSONObject();
      root.put("msgList", new Gson().toJson(volist));
      if (page == 1) {
      if (page == 1 && uid != null) {
         UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
         UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
         if (usm != null)