邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

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

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

    * @return

    */

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

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

         throws UserMoneyDetailException {



      if (StringUtil.isNullOrEmpty(orderId))

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

      detail.setCreateTime(new Date());

      detail.setIdentifyCode(

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

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

      detail.setMoney(money);

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

      detail.setType(UserMoneyDetailTypeEnum.fanli);

@@ -165,7 +165,8 @@
      detail.setMoney(money);

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

      detail.setType(UserMoneyDetailTypeEnum.invite);

      detail.setDescInfo(String.format("有效订单:%s笔   维权订单:%s笔   失效订单:%s笔", validCount, weiQuanCount, invalidCount));

      if (validCount != 0 || weiQuanCount != 0 || invalidCount != 0)

         detail.setDescInfo(String.format("有效订单:%s笔   维权订单:%s笔   失效订单:%s笔", validCount, weiQuanCount, invalidCount));

      detail.setUpdateTime(new Date());

      detail.setUserInfo(new UserInfo(uid));

      return detail;

@@ -407,6 +408,7 @@
      detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractReject.name() + ":" + extract.getId()));

      detail.setMoney(extract.getMoney());

      detail.setSourceIdentifyId(extract.getId());

      detail.setSubTitle("原路退回");

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

      detail.setType(UserMoneyDetailTypeEnum.extractReject);

      detail.setUpdateTime(new Date());