Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

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

@@ -278,5 +278,23 @@
      detail.setUser(new UserInfo(uid));

      return detail;

   }

	
	
   public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,

         String beiZhu) {

      if (money == null || orderId == 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.orderReward);

      detail.setOrderId(orderId);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      return detail;

   }



}