fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java
@@ -137,7 +137,6 @@ // 用户签到 Integer signState = 0; int signDays = 1; if (page == 1) { // 签到 @@ -167,9 +166,6 @@ // 签到日期信息 DailySignVO dailySignVO = integralTaskClassService.getDailySignList(uid, userRank.getId()); if (dailySignVO != null) { signDays = dailySignVO.getDays(); } boolean ejectSign = false; if (signState == 1) fanli/src/main/java/com/yeshi/fanli/dto/msg/MsgOtherExchangeContentDTO.java
@@ -8,6 +8,20 @@ */ public class MsgOtherExchangeContentDTO { public enum MsgTypeOtherTypeEnum { coupon("券"), taoLiJin("推广红包"), cash("现金"), invite("激活或发布卡"); private final String desc; private MsgTypeOtherTypeEnum(String desc) { this.desc = desc; } public String getDesc() { return desc; } } private String state; // 状态 private String expend; // 消耗 private String totalGold; //赠送类别 fanli/src/main/java/com/yeshi/fanli/job/TaoLiJinJob.java
@@ -196,7 +196,7 @@ for (UserTaoLiJinGiveRecord record: overdueList) { try { userTaoLiJinOriginService.giveSendBack(record.getGiveUid(), record.getAmount()); userTaoLiJinOriginService.giveSendBack(record.getGiveUid(), record); // 更新记录 UserTaoLiJinGiveRecord updateRecord = new UserTaoLiJinGiveRecord(); updateRecord.setId(record.getId()); fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
@@ -99,8 +99,18 @@ if (StringUtil.isNullOrEmpty(progress)) continue; // 自购免单券-只能兑换一次 if (type == ExchangeTypeEnum.freeCouponBuy) { long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null); if (num >= 1) { listValid.remove(i); i --; continue; } } // 今日兑换情况 long num = integralExchangeRecordMapper.countRecordByUid(id, uid, null); long num = integralExchangeRecordMapper.countRecordByUid(id, uid, 1); Integer upperLimit = exchange.getUpperLimit(); if (upperLimit == null) { progress = progress.replace("{已兑换}", num + "").replace("/{上限数}", ""); fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java
@@ -14,9 +14,11 @@ import org.yeshi.utils.DateUtil; import com.yeshi.fanli.dao.mybatis.tlj.UserTaoLiJinOriginMapper; import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO; import com.yeshi.fanli.dto.msg.MsgOtherTaoLiJinContentDTO; import com.yeshi.fanli.entity.bus.tlj.DeviceTaoLiJinRecord; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum; @@ -614,10 +616,12 @@ @Override @Transactional public void giveSendBack(Long uid, BigDecimal money) throws UserTaoLiJinOriginException{ if (uid == null || money == null) { public void giveSendBack(Long uid, UserTaoLiJinGiveRecord record) throws UserTaoLiJinOriginException{ if (uid == null || record == null) { throw new UserTaoLiJinOriginException(1, "参数不能为空"); } BigDecimal money = record.getAmount(); // 添加红包余额 userMoneyExtraService.addTaoLiJin(uid, money, false); @@ -632,6 +636,24 @@ detail.setTitle(TaoLiJinDetailTypeEnum.giveBack.getDesc()); detail.setCreateTime(new Date()); userTaoLiJinDetailService.insertSelective(detail); executor.execute(new Runnable() { @Override public void run() { // 退回消息 String beiZhu = "请到我的-推广红包查看"; SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm"); MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO(); msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ); msgOther.setTitle("赠送推广红包退回"); msgOther.setGiveType("你赠送的"+ money + "推广红包未被成功领取"); msgOther.setGiveTime(sd.format(record.getGiveTime())); msgOther.setReturnTime(sd.format(new Date())); userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther); } }); } } fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -373,7 +373,7 @@ msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON); msgOther.setTitle("赠送免单券"); msgOther.setGiveType("你赠送的免单券被成功领取"); msgOther.setReceiveInfo("昵称: " + userName + " ID:" + uid); msgOther.setReceiveInfo("昵称: ：" + userName + " ID：" + uid); msgOther.setGiveTime(sd.format(giveRecord.getGiveTime())); msgOther.setReceiveTime(sd.format(new Date())); userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther); @@ -495,7 +495,7 @@ userName = user.getNickName(); MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO(); msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON); msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ); msgOther.setTitle("赠送推广红包"); msgOther.setGiveType("你赠送的推广红包被成功领取"); msgOther.setReceiveInfo("昵称: " + userName + " ID:" + uid); fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinOriginService.java
@@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin; import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport; import com.yeshi.fanli.entity.bus.user.UserRank; @@ -153,8 +154,8 @@ /** * 红包赠送退回 * @param uid * @param money * @param UserTaoLiJinGiveRecord record * @throws UserTaoLiJinOriginException */ public void giveSendBack(Long uid, BigDecimal money) throws UserTaoLiJinOriginException; public void giveSendBack(Long uid, UserTaoLiJinGiveRecord record) throws UserTaoLiJinOriginException; } fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -732,6 +732,12 @@ contentList.add(new ClientTextStyleVO(dto.getReceiveTime() + "", COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("领取时间", COLOR_TITLE), contentList)); } if (!StringUtil.isNullOrEmpty(dto.getReturnTime())) { contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO(dto.getReturnTime() + "", COLOR_CONTENT)); items.add(new CommonMsgItemVO(new ClientTextStyleVO("退回时间", COLOR_TITLE), contentList)); } contentList = new ArrayList<>(); contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),
