From 8d38972b593b5ba698b0e605039ed8c795eaaef5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 17:35:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java
index 694c0fd..f1b772f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinNewbies;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.push.DeviceActive;
+import com.yeshi.fanli.entity.taobao.TLJFreeBuyGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
@@ -40,6 +41,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -242,6 +244,13 @@
if (uid == null || uid <= 0 || goods == null)
throw new UserTaoLiJinNewbiesException(1,"鍙傛暟淇℃伅缂哄け");
+ // 楠岃瘉鍟嗗搧鏄惁鍦ㄥ厤鍗曞晢鍝佸簱
+ TLJFreeBuyGoods tljFreeBuyGoods = tljFreeBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),
+ TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+ if (tljFreeBuyGoods == null)
+ throw new UserTaoLiJinNewbiesException(1, "璇ュ晢鍝侀潪鍏嶅崟鍟嗗搧");
+
+ // 楠岃瘉鏄惁鏈夊埜
if (goods == null || goods.getCouponAmount() == null ||
goods.getCouponAmount().compareTo(new BigDecimal(0)) == 0) {
executor.execute(new Runnable() {
@@ -253,6 +262,7 @@
throw new UserTaoLiJinNewbiesException(1, "璇ュ晢鍝侀潪鍏嶅崟鍟嗗搧");
}
+ // 楠岃瘉鍒稿悗浠� 鏄惁鍦� 1-2鍏�
BigDecimal money = TaoBaoUtil.getAfterUseCouplePrice(goods);
if (money.compareTo(new BigDecimal(1.0)) < 0 && money.compareTo(new BigDecimal(2.0)) > 0) {
executor.execute(new Runnable() {
@@ -264,10 +274,12 @@
throw new UserTaoLiJinNewbiesException(1, "璇ュ晢鍝侀潪鍏嶅崟鍟嗗搧");
}
+ // 楠岃瘉鐢ㄦ埛淇℃伅
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || userInfoExtra.getFirstLoginTime() == null)
throw new UserTaoLiJinNewbiesException(1001, "浣犱笉鏄�滄柊鐢ㄦ埛鈥濇棤娉曚娇鐢ㄦ柊浜虹孩鍖�0鍏冭喘涔般��");
+ // 楠岃瘉鏄惁宸茶秴鍑烘柊鐢ㄦ埛瀹氫箟
try {
int days = DateUtil.daysBetween2(userInfoExtra.getFirstLoginTime(), new Date());
if (days > Constant.TLJ_NEW_USER_DEFINE)
@@ -276,11 +288,13 @@
throw new UserTaoLiJinNewbiesException(1, "鏃ユ湡淇℃伅璁＄畻澶辫触");
}
+ // 楠岃瘉浣欓
UserTaoLiJinNewbies taoLiJinNewbies = userTaoLiJinNewbiesMapper.selectForUpdate(uid);
if (taoLiJinNewbies == null || taoLiJinNewbies.getMoney() == null ||
taoLiJinNewbies.getMoney().compareTo(money) < 0)
throw new UserTaoLiJinNewbiesException(1001, "鏂颁汉绾㈠寘涓嶈冻锛岃鎹釜鍟嗗搧鍐嶈瘯鎴栫户缁鍙栧埌瓒抽鏂颁汉绾㈠寘銆�");
+ // 楠岃瘉鏄惁宸茶繃鏈�
if (taoLiJinNewbies.getEndTime() == null
|| taoLiJinNewbies.getEndTime().getTime() < java.lang.System.currentTimeMillis())
throw new UserTaoLiJinNewbiesException(1, "鏂颁汉绾㈠寘宸茶繃鏈�");
--
Gitblit v1.8.0