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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -4,6 +4,8 @@
import java.util.Calendar;

import java.util.Date;



import org.yeshi.utils.StringUtil;



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

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;

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

@@ -362,6 +364,8 @@
      detail.setUser(new UserInfo(uid));

      return detail;

   }

	
	


   /**

    * 邀请订单补贴

@@ -394,5 +398,27 @@


      return detail;

   }

	
	
   /**

    * 红包相关信息

    * @param uid

    * @param type

    * @param content

    * @param beiZhu

    * @return

    */

   public static MsgMoneyDetail createRedPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu) {

      if (uid == null || type == null || StringUtil.isNullOrEmpty(content))

         return null;

      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setUser(new UserInfo(uid));

      detail.setRead(false);

      detail.setContent(content);

      detail.setMsgType(type);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      return detail;

   }



}