Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -278,8 +278,7 @@
      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)

@@ -297,4 +296,21 @@
      return detail;

   }



   public static MsgMoneyDetail createSystemEqualizeMsg(Long uid, String reason, 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.systemEqualize);

      detail.setOrderId(reason);

      detail.setRead(false);

      detail.setUser(new UserInfo(uid));

      return detail;

   }



}