Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java

@@ -5,11 +5,9 @@
import java.util.List;



import com.google.gson.Gson;

import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;

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

import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail.MsgTypeInviteTypeEnum;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.msg.CommonMsgItemVO;

@@ -278,33 +276,4 @@
      return detail;

   }

   



	
	
	
   /**

    *  领取信息激活邀请关系

    * 
    * @param threeSale

    * @param uid

    * @return

    */

   public static MsgInviteDetail receiveGift(Long uid, String beiZhu, MsgInviteContentDTO content) {

      if (content == null || uid == null)

         return null;



      MsgInviteDetail detail = new MsgInviteDetail();

      if (StringUtil.isNullOrEmpty(beiZhu))

         detail.setBeiZhu("无");

      else

         detail.setBeiZhu(beiZhu);

		
      detail.setCreateTime(new Date());

      detail.setUpdateTime(new Date());

      detail.setDesc(new Gson().toJson(content));

      detail.setMsgType(MsgTypeInviteTypeEnum.receiveGift);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      return detail;

   }

}