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

yujian

2020-04-14 c04a59775ee986f33fe19e21ae02cff9f6b002a7

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

@@ -5,7 +5,6 @@
import java.util.List;



import com.google.gson.Gson;

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

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

import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;

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

@@ -15,55 +14,6 @@
import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;



public class MsgOtherDetailFactory {



   /**

    * 券相关信息的通知

    * 
    * @param uid

    * @param content

    * @param type

    * @param beiZhu

    * @return

    */

   public static MsgOtherDetail createCouponMsg(Long uid, Long userCouponId, MsgOtherCouponContentDTO content,

         MsgTypeOtherTypeEnum type, String beiZhu) {

      if (uid == null)

         return null;

      MsgOtherDetail detail = new MsgOtherDetail();

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      detail.setCoupnContent(content);

      detail.setType(type);

      detail.setSourceId(userCouponId);

      return detail;

   }

	
   /**

    * 券相关信息的通知

    * 
    * @param uid

    * @param content

    * @param type

    * @param beiZhu

    * @return

    */

   public static MsgOtherDetail createTaoLiJinMsg(Long uid, Long userCouponId, MsgOtherCouponContentDTO content,

         MsgTypeOtherTypeEnum type, String beiZhu) {

      if (uid == null)

         return null;

      MsgOtherDetail detail = new MsgOtherDetail();

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      detail.setCoupnContent(content);

      detail.setType(type);

      detail.setSourceId(userCouponId);

      return detail;

   }



   

   

   /**