admin
2019-05-05 81082e03207761edff6b317df8268dc3f968c20a
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -49,6 +49,7 @@
import com.yeshi.fanli.exception.goods.RecommendUserGoodsException;
import com.yeshi.fanli.exception.msg.UserSystemMsgException;
import com.yeshi.fanli.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.RecommendUserGoodsService;
@@ -61,6 +62,7 @@
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.push.PushGoodsService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
@@ -70,6 +72,7 @@
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.factory.msg.UserMsgVOFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.msg.UserCommonMsgVO;
import com.yeshi.fanli.vo.msg.UserHomeMsgVO;
import com.yeshi.fanli.vo.msg.UserMsgCenter;
import com.yeshi.fanli.vo.msg.UserMsgVO;
@@ -125,6 +128,12 @@
   @Resource
   private SpecialService specialService;
   @Resource
   private JumpDetailV2Service jumpDetailV2Service;
   @Resource
   private PushGoodsService pushGoodsService;
   // 消息的类型
   final static String MSG_TYPE_ORDER = "order";
@@ -539,6 +548,18 @@
      List<UserMsgCenter> listCenter = new ArrayList<>();
      // 单条消息
      List<UserCommonMsgVO> commonMsgList = new ArrayList<>();
      commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_kefu.png", "人工客服", new Date(),
            UserCommonMsgVO.TYPE_KEFU, "", false, null, null));
      // 推荐记录
      // list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);
      commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "推荐记录",
            new Date(), UserCommonMsgVO.TYPE_RECOMMEND, "防油防水防潮,污渍一抹即净,从胃到心的暖意", false,
            jumpDetailV2Service.getByTypeCache("recommend_list"), null));
      // 1、活动区域
      List<Special> listSpecial = specialService.listByPlaceKey("msg_activities");
      if (listSpecial != null && listSpecial.size() > 0) {
@@ -656,6 +677,7 @@
      }
      root.put("list", builder.create().toJson(listCenter));
      root.put("commonList", builder.create().toJson(commonMsgList));
      root.put("count", listCenter.size());
      out.print(JsonUtil.loadTrueResult(root));
   }