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

admin

2020-04-01 c70caa91e6b0e1f944b148b55685aca43bb90783

 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,62 @@


      return detail;

   }

	
   /**

    * 团队奖励

    * @Title: createOrderTeamRewardMsg

    * @Description: 
    * @param uid

    * @param date

    * @param from

    * @param money

    * @param balance

    * @param beiZhu

    * @return 
    * MsgMoneyDetail 返回类型

    * @throws

    */

   public static MsgMoneyDetail createOrderTeamRewardMsg(Long uid, Date date, String from, BigDecimal money,

         BigDecimal balance, String beiZhu) {

      if (money == null || money == null || uid == null)

         return null;



      MsgMoneyDetail detail = new MsgMoneyDetail();

      detail.setBalance(balance);

      detail.setBeiZhu(beiZhu);

      detail.setCreateTime(new Date());

      detail.setMoney(money);

      detail.setMsgType(MsgTypeMoneyTypeEnum.orderTeamReward);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      Calendar calendar = Calendar.getInstance();

      calendar.setTime(date);

      detail.setStateDesc(String.format("%s年%s月团队奖励到账", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));

      detail.setDesc(from);



      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;

   }



}