Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-11-04 148af6b2f57be264c84d0991237fbd7ddea491a4

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

@@ -2,6 +2,8 @@


import java.util.Date;



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.ThreeSale;

@@ -85,4 +87,31 @@
      detail.setUser(new UserInfo(uid));

      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;

   }

}