From fd21d973d2cd05f251cbe17adc581aea5adc8760 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 15 十月 2019 09:32:12 +0800
Subject: [PATCH] 品牌更新暂注释
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 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..8850fd9 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;
@@ -29,8 +30,6 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
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.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinGiveRecordService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
@@ -40,6 +39,9 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TokenUtil;
@@ -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
@@ -204,10 +210,10 @@
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佽�呯殑涓�绾ч槦鍛橈紱");
- tips.add("杩斿埄鍒稿鍔卞埜锛屽彲鐢ㄤ簬鈥滃凡鍒拌处鈥濈殑杩斿埄璁㈠崟锛屽湪杩斿埄鐨勫熀纭�涓婂啀鑾峰緱涓�瀹氭瘮渚嬬殑杩斿埄锛�");
+ tips.add("鏉挎牀蹇渷濂栧姳鍒革紝鍙敤浜庘�滃凡鍒拌处鈥濈殑杩斿埄璁㈠崟锛屽湪杩斿埄鐨勫熀纭�涓婂啀鑾峰緱涓�瀹氭瘮渚嬬殑杩斿埄锛�");
tips.add("鎴愬姛棰嗗彇鍚庯紝璇峰埌鈥滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅銆�");
} else {
- tips.add("杩斿埄鍒稿鍔卞埜锛屽彲鐢ㄤ簬鈥滃凡鍒拌处鈥濈殑杩斿埄璁㈠崟锛屽湪杩斿埄鐨勫熀纭�涓婂啀鑾峰緱涓�瀹氭瘮渚嬬殑杩斿埄锛�");
+ tips.add("鏉挎牀蹇渷濂栧姳鍒革紝鍙敤浜庘�滃凡鍒拌处鈥濈殑杩斿埄璁㈠崟锛屽湪杩斿埄鐨勫熀纭�涓婂啀鑾峰緱涓�瀹氭瘮渚嬬殑杩斿埄锛�");
tips.add("鎴愬姛棰嗗彇鍚庯紝璇峰埌鈥滄垜鐨�-绂忓埄涓績鈥濅腑鏌ョ湅銆�");
}
} else {
@@ -215,20 +221,22 @@
}
} else if (tokenType == TokenTypeEnum.taoLiJin) {
type = 12;
- UserTaoLiJinGiveRecord giveRecord = userTaoLiJinGiveRecordService
- .selectByPrimaryKey(Long.parseLong(identify));
- if (giveRecord == null || giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_OVERDUE) {
+
+ UserTaoLiJinGiveRecord giveRecord = userTaoLiJinGiveRecordService.selectByPrimaryKey(Long.parseLong(identify));
+ if (giveRecord == null)
+ throw new TokenRecordException(1, "鍙ｄ护宸插け鏁�");
+
+ BigDecimal amount = giveRecord.getAmount();
+ num = Integer.parseInt(amount.setScale(0).toString());
+
+ if(giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_OVERDUE) {
tips.add("鍝庡憖锛屾帹骞跨孩鍖呭凡澶辨晥浜嗭紒");
} else if (giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_RECEIVE) {
tips.add("鍝庡憖锛屾帹骞跨孩鍖呭凡琚鍙栦簡锛�");
} else if (giveRecord.getState() == UserTaoLiJinGiveRecord.STATE_INIT) {
if (uid == null || uid <= 0)
throw new TokenRecordException(1001, "娓╅Θ鎻愮ず锛孾鎺ㄥ箍绾㈠寘]闇�瑕佺櫥褰曞悗棰嗗彇");
-
state = true;
- BigDecimal amount = giveRecord.getAmount();
- num = Integer.parseInt(amount.setScale(0).toString());
-
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
tips.add("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佽�呯殑涓�绾ч槦鍛橈紱");
@@ -257,7 +265,7 @@
}
if (StringUtil.isNullOrEmpty(nickName))
- nickName = Constant.systemCommonConfig.getDefaultNickName();
+ nickName = Constant.systemCommonConfig.getDefaultNickName() + inviteId;
if (StringUtil.isNullOrEmpty(portrait))
portrait = Constant.systemCommonConfig.getDefaultPortrait();
@@ -335,7 +343,7 @@
UserSystemCoupon userSystemCoupon= null;
try {
userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(),
- UserSystemCoupon.SOURCE_GIVE, null);
+ UserSystemCoupon.SOURCE_GIVE, null,true);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
throw new TokenRecordException(1, "棰嗗彇澶辫触");
@@ -396,6 +404,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) {
@@ -425,7 +437,7 @@
UserSystemCoupon userSystemCoupon= null;
try {
userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
- UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent());
+ UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent(),true);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
throw new TokenRecordException(1, "棰嗗彇澶辫触");
@@ -486,6 +498,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 +554,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 +596,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