From 10abb8f04d3bacd4cead1758aae48726ccd29c66 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 22 十月 2019 10:43:48 +0800
Subject: [PATCH] 淘礼金赠送红包功能恢复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 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 0a5cffd..06db636 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
@@ -30,9 +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.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;
@@ -42,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;
@@ -67,9 +67,6 @@
private ThreeSaleSerivce threeSaleSerivce;
@Resource
- private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;
-
- @Resource
private UserInfoExtraService userInfoExtraService;
@Resource
@@ -77,9 +74,6 @@
@Resource
private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
-
- @Resource
- private UserTaoLiJinOriginService userTaoLiJinOriginService;
@Resource
private UserOtherMsgNotificationService userOtherMsgNotificationService;
@@ -93,6 +87,13 @@
@Resource
private UserInviteMsgNotificationService userInviteMsgNotificationService;
+
+ @Resource
+ private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;
+
+ @Resource
+ private UserTaoLiJinOriginService userTaoLiJinOriginService;
+
@Override
@@ -210,10 +211,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 {
@@ -221,20 +222,21 @@
}
} 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("纭棰嗗彇鍚庯紝浣犲皢鎴愪负璧犻�佽�呯殑涓�绾ч槦鍛橈紱");
@@ -341,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, "棰嗗彇澶辫触");
@@ -435,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, "棰嗗彇澶辫触");
--
Gitblit v1.8.0