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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -10,20 +10,16 @@
public class MsgOtherDetailFactory {



   /**

    * 返利订单

    * 券相关信息的通知

    * 

    * @param uid

    * @param orderId

    * @param goodsCount

    * @param orderState

    * @param payMoney

    * @param money

    * @param state

    * @param content

    * @param type

    * @param beiZhu

    * @return

    */

   public static MsgOtherDetail createFanLiOrder(Long uid, MsgOtherCouponContentDTO content, MsgTypeOtherTypeEnum type,

         String beiZhu) {

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

         MsgTypeOtherTypeEnum type, String beiZhu) {

      if (uid == null)

         return null;

      MsgOtherDetail detail = new MsgOtherDetail();

@@ -32,6 +28,32 @@
      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;

   }