From b2901a0793cfe3a1eb04318c1f8786c988e83108 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 16 八月 2019 14:28:14 +0800
Subject: [PATCH] 的
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 f79dcc0..cbdd881 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
@@ -7,11 +7,9 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dao.mybatis.user.TokenRecordMapper;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.TokenRecord;
import com.yeshi.fanli.entity.bus.user.TokenRecord.TokenTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -19,13 +17,13 @@
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.exception.user.TokenRecordException;
-import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinGiveRecordService;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -52,6 +50,9 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+ @Resource
+ private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
+
@Override
public void insertSelective(TokenRecord record) {
record.setCreateTime(new Date());
@@ -227,8 +228,13 @@
if (StringUtil.isNullOrEmpty(identify))
throw new TokenRecordException(1, "鍙ｄ护鏍囪瘑涓嶅瓨鍦�");
- boolean receive = false;
+ Long giveUid = rokenRecord.getUid();
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra == null)
+ throw new TokenRecordException(1, "鐢ㄦ埛淇℃伅缂哄け");
+
+ boolean receive = false;
TokenTypeEnum tokenType = rokenRecord.getType();
if (tokenType == TokenTypeEnum.freeCoupon) {
UserSystemCoupon userCoupon = userSystemCouponService.selectByPrimaryKey(Long.parseLong(identify));
@@ -253,8 +259,11 @@
userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(), UserSystemCoupon.SOURCE_GIVE);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
+ throw new TokenRecordException(1, "棰嗗彇澶辫触");
}
+ // 鏇存柊璁板綍
+ userSystemCouponGiveRecordService.updateRecord(uid, giveUid, Long.parseLong(identify));
// 棰嗗彇鎴愬姛
receive = true;
} else {
@@ -285,6 +294,7 @@
userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(), UserSystemCoupon.SOURCE_GIVE);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
+ throw new TokenRecordException(1, "棰嗗彇澶辫触");
}
// 棰嗗彇鎴愬姛
receive = true;
@@ -300,6 +310,9 @@
throw new TokenRecordException(1, "鍝庡憖锛屾帹骞跨孩鍖呭凡琚鍙栦簡锛�");
} else {
+
+
+
}
} else {
throw new TokenRecordException(1, "鏃犲搴旂被鍨�");
@@ -308,7 +321,12 @@
if (receive)
throw new TokenRecordException(1, "棰嗗彇澶辫触鍟�");
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
+ // 鎴愪负涓嬬骇
+
+
+ }
+
}
}
--
Gitblit v1.8.0