更改goodsType

yujian

2019-09-17 d3a9feeeee6f70462d12e48db5fd1cab9b183bc8

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java

@@ -29,6 +29,7 @@
import com.yeshi.fanli.entity.bus.user.UserRank;

import com.yeshi.fanli.exception.tlj.UserTaoLiJinOriginException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;

import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;

import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;

import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;

@@ -37,7 +38,6 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinReportService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;



@@ -626,9 +626,8 @@
      // 添加红包余额

      userMoneyExtraService.addTaoLiJin(uid, money, false);

      // 添加新增记录

      UserTaoLiJinOrigin origin = saveOrigin(uid, 1, money, TaoLiJinOriginEnum.giveSendBack);

      saveOrigin(uid, 1, money, TaoLiJinOriginEnum.giveSendBack);

      // 红包明细

      userTaoLiJinDetailService.createAddDetail(origin);

      UserTaoLiJinDetail detail = new UserTaoLiJinDetail();

      detail.setUid(uid);

      detail.setMoney(money);

@@ -646,8 +645,8 @@
            SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");

            MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();

            msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ);

            msgOther.setTitle("赠送推广红包退回");

            msgOther.setGiveType("你赠送的"+ money + "推广红包未被成功领取");

            msgOther.setTitle("推广红包退回");

            msgOther.setGiveType("你赠送的¥"+ money + "元推广红包未被领取");

            msgOther.setGiveTime(sd.format(record.getGiveTime()));

            msgOther.setReturnTime(sd.format(new Date()));

            userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);