Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

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

@@ -117,7 +117,8 @@


      UserMoneyDetail detail = new UserMoneyDetail();

      detail.setCreateTime(new Date());

      detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.share.name() + "-" + uid + "-" + timeF));

      detail.setIdentifyCode(

            StringUtil.Md5(UserMoneyDetailTypeEnum.share.name() + "-" + orderType + "-" + uid + "-" + timeF));

      detail.setMoney(money);

      detail.setTitle(timeF + UserMoneyDetailTypeEnum.share.getDesc());

      detail.setType(UserMoneyDetailTypeEnum.share);

@@ -159,7 +160,8 @@


      UserMoneyDetail detail = new UserMoneyDetail();

      detail.setCreateTime(new Date());

      detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.invite.name() + "-" + uid + "-" + timeF));

      detail.setIdentifyCode(

            StringUtil.Md5(UserMoneyDetailTypeEnum.invite.name() + "-" + orderType + "-" + uid + "-" + timeF));

      detail.setMoney(money);

      detail.setTitle(timeF + UserMoneyDetailTypeEnum.invite.getDesc());

      detail.setType(UserMoneyDetailTypeEnum.invite);