From 06e70064fbc059c8cc9c654376ce589945e9702d Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 03 十二月 2019 12:32:41 +0800
Subject: [PATCH] 品牌修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index eabd256..fc791f2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -2,9 +2,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
-import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -13,7 +11,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.DateUtil;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
@@ -26,10 +23,8 @@
import com.yeshi.fanli.dto.pdd.PDDPromotionUrl;
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinNewbies;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDGoodsClass;
@@ -435,7 +430,6 @@
extraVO.setH5Url(h5Url);
}
- String tips = null;
String helpLink = null;
boolean fanliValid = true;
boolean shareValid = true;
@@ -500,24 +494,6 @@
otherInfo.setReduceHongBao(newUserHongBao);
goodsDetail.setOtherInfo(otherInfo);
- tips = "浣犱笉鏄�滄柊鐢ㄦ埛鈥濇棤娉曚娇鐢ㄦ柊浜虹孩鍖�0鍏冭喘涔般��";
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && userInfoExtra.getFirstLoginTime() != null) {
- try {
- int days = DateUtil.daysBetween2(userInfoExtra.getFirstLoginTime(), new Date());
- if (days < Constant.TLJ_NEW_USER_DEFINE){
- UserTaoLiJinNewbies winDetail = userTaoLiJinNewbiesService.selectByPrimaryKey(uid);
- if (winDetail == null || winDetail.getEndTime().getTime() < java.lang.System.currentTimeMillis()
- || winDetail.getMoney().compareTo(couponPrice) < 0) {
- tips = "鏂颁汉绾㈠寘涓嶈冻锛岃鎹釜鍟嗗搧鍐嶈瘯鎴栫户缁鍙栧埌瓒抽鏂颁汉绾㈠寘銆�";
- } else {
- tips = null;
- }
- }
- } catch (ParseException e) {
- e.printStackTrace();
- }
- }
} else {// 鏅�氳喘涔�
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
@@ -539,7 +515,6 @@
}
extraVO.setFanliValid(fanliValid);
extraVO.setShareValid(shareValid);
- extraVO.setTips(tips);
MoneyInfoVO goodsMoney = goodsDetail.getMoneyInfo();
if (goodsMoney != null) {
--
Gitblit v1.8.0