From ddb6519f9cfc8a0ce8e2b32af7906a647dfe136e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 11 九月 2019 16:05:50 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
index 19456c6..0a5cffd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.user.TokenRecordMapper;
+import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
import com.yeshi.fanli.dto.msg.MsgOtherGiveContentDTO;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord;
import com.yeshi.fanli.entity.bus.user.TokenRecord;
@@ -31,6 +32,7 @@
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.integral.IntegralGetService;
+import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;
import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinGiveRecordService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
@@ -58,6 +60,7 @@
private UserInfoService userInfoService;
@Resource
+ @Lazy
private UserSystemCouponService userSystemCouponService;
@Resource
@@ -87,6 +90,9 @@
@Resource
private SystemCouponService systemCouponService;
+
+ @Resource
+ private UserInviteMsgNotificationService userInviteMsgNotificationService;
@Override
@@ -257,7 +263,7 @@
}
if (StringUtil.isNullOrEmpty(nickName))
- nickName = Constant.systemCommonConfig.getDefaultNickName();
+ nickName = Constant.systemCommonConfig.getDefaultNickName() + inviteId;
if (StringUtil.isNullOrEmpty(portrait))
portrait = Constant.systemCommonConfig.getDefaultPortrait();
@@ -396,6 +402,10 @@
msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));
msgOther.setReceiveTime(sd.format(new Date()));
userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);
+
+ // 婵�娲婚個璇蜂俊鎭�
+ if (addTeam)
+ addInviteMsg(uid, giveUid, "鍏嶅崟鍒�");
}
});
} else if (tokenType == TokenTypeEnum.rebatePercentCoupon) {
@@ -486,6 +496,10 @@
msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));
msgOther.setReceiveTime(sd.format(new Date()));
userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);
+
+ // 婵�娲婚個璇蜂俊鎭�
+ if (addTeam)
+ addInviteMsg(uid, giveUid, "杩斿埄濂栧姳鍒�");
}
});
} else if (tokenType == TokenTypeEnum.taoLiJin) {
@@ -538,6 +552,10 @@
msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));
msgOther.setReceiveTime(sd.format(new Date()));
userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);
+
+ // 婵�娲婚個璇蜂俊鎭�
+ if (addTeam)
+ addInviteMsg(uid, giveUid, amount.setScale(2) + "鍏冩帹骞跨孩鍖�");
}
});
} catch (UserTaoLiJinOriginException e) {
@@ -576,5 +594,39 @@
}
return invite;
}
+
+
+ private void addInviteMsg(Long uid, Long giveUid, String giftName) {
+ try {
+ UserInfo user = userInfoService.selectByPKey(giveUid);
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ MsgInviteContentDTO msgInvite = new MsgInviteContentDTO();
+ msgInvite.setTitle("閭�璇锋秷鎭�");
+ msgInvite.setState("鎴愬姛婵�娲婚個璇�");
+ msgInvite.setCode("浣犵殑閭�璇风爜锛�" + userInfoExtra.getInviteCode());
+ msgInvite.setInviter("鏄电О锛�"+user.getNickName());
+ msgInvite.setMode("鎴愬姛棰嗗彇閭�璇蜂汉鐨�" + giftName);
+ userInviteMsgNotificationService.receiveGift(uid, "閭�璇峰叧绯讳竴鏃︾‘绔嬫棤娉曟洿鏀� ", msgInvite);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+ @Override
+ public List<TokenRecord> overdueList(int count) {
+ return tokenRecordMapper.overdueList(count);
+ }
+
+ @Override
+ public void overdue(List<TokenRecord> list) {
+ if (list == null || list.size() == 0)
+ return;
+ Date date = new Date();
+ for (TokenRecord tokenRecord: list) {
+ tokenRecord.setState(1);
+ tokenRecord.setUpdateTime(date);
+ tokenRecordMapper.updateByPrimaryKeySelective(tokenRecord);
+ }
+ }
}
--
Gitblit v1.8.0