Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java

@@ -23,7 +23,7 @@
    * @param hongBaoList

    * @return

    */

   public static UserMoneyDetail createFanLi(Long uid, String orderId, int orderType, Long hbId, BigDecimal money)

   public static UserMoneyDetail createFanLi(Long uid, String orderId, int orderType, String hbIds, BigDecimal money)

         throws UserMoneyDetailException {



      if (StringUtil.isNullOrEmpty(orderId))

@@ -38,7 +38,7 @@
      UserMoneyDetail detail = new UserMoneyDetail();

      detail.setCreateTime(new Date());

      detail.setIdentifyCode(StringUtil

            .Md5(UserMoneyDetailTypeEnum.fanli.name() + "-" + uid + "-" + orderType + "-" + orderId + "-" + hbId));

            .Md5(UserMoneyDetailTypeEnum.fanli.name() + "-" + uid + "-" + orderType + "-" + orderId + "-" + hbIds));

      detail.setMoney(money);

      detail.setTitle(UserMoneyDetailTypeEnum.fanli.getDesc());

      detail.setType(UserMoneyDetailTypeEnum.fanli);