删除了部分残余代码

admin

2019-03-20 435bed78efa8ab34bbf456ef55eb586ccfc113f1

 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);

@@ -255,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++) {

@@ -286,7 +326,7 @@
               }

            }

            try {

               recommendUserGoodsService.addRecommend(uid, "", goodsList);

               recommendUserGoodsService.addRecommend(uid, device, "", goodsList);

            } catch (RecommendUserGoodsException e) {

               e.printStackTrace();

            }

@@ -294,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++) {

@@ -325,7 +365,7 @@
               }

            }

            try {

               recommendUserGoodsService.addRecommend(uid, "", goodsList);

               recommendUserGoodsService.addRecommend(uid, device, "", goodsList);

            } catch (RecommendUserGoodsException e) {

               e.printStackTrace();

            }

@@ -343,15 +383,18 @@
    */

   @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) {

         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 {

@@ -361,28 +404,32 @@
            }

         }



         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 (hour < 12)

               addRecommendGoods(uid);

            else

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

            if (canAdd) {

               if (hour < 12)

                  addRecommendGoods(uid, device);

               else

                  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) {

@@ -425,7 +472,7 @@
         volist.add(vo);

      }



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

      Long time = System.currentTimeMillis();//userInfoService.selectByPKey(uid).getCreatetime();

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

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



@@ -444,7 +491,7 @@


      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)

@@ -529,7 +576,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;