From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 74 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index 55ea116..a714a4f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -12,6 +12,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.goods.recommend.RecommendGoodsDeleteHistory;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TBPid;
@@ -21,12 +22,15 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
+import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -60,10 +64,20 @@
@Resource
private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;
-
+
@Resource
private BusinessEmergent110Service businessEmergent110Service;
+ @Resource
+ private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private UserTaoLiJinRecordService userTaoLiJinRecordService;
+
+
/**
* 鑾峰彇娣樺疂鐨勫垎浜摼鎺�
*
@@ -74,8 +88,8 @@
* @param out
*/
@RequestMapping(value = "gettaobaolink")
- public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, String from, HttpServletRequest request,
- PrintWriter out) {
+ public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, String from, String source,
+ HttpServletRequest request, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
return;
@@ -148,7 +162,21 @@
// 鏄繑鍒╁晢鍝佸簱鐨勫晢鍝�
if (specialConvert) {
if (!StringUtil.isNullOrEmpty(specialId)) {
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
+ if (source != null && "taolijin".equals(source)) {
+ boolean isNewUser = userInfoExtraService.isNewUser(uid);
+ if (isNewUser) {
+ // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
+ long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
+ if (countRecord == 0) {
+ taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId);
+ }
+ }
+ }
+
+ if (taoBaoLink == null) {
+ taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
+ }
+
data.put("native", true);
} else {
if (!specialConvert && !isNative) {
@@ -237,16 +265,18 @@
data.put("tbPidInfo", clientTBPid);
data.put("native", true);
}
-
+
out.print(JsonUtil.loadTrueResult(data));
} else {
out.print(JsonUtil.loadFalseResult(1, "璇锋眰澶辫触"));
}
-
+
businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
}
-
- }
+ }
+
+
+
/**
* 鏄惁鍦ㄥ弬涓庢帹骞�
@@ -295,4 +325,32 @@
}
}
+ /**
+ * 鍒犻櫎鎺ㄨ崘鍟嗗搧
+ *
+ * @param acceptData
+ * @param goodsId
+ * @param source
+ * @param uid
+ * @param reason
+ * @param out
+ */
+ @RequestMapping(value = "deleteRecommendGoods")
+ public void deleteRecommendGoods(AcceptData acceptData, Long goodsId, Integer source, Long uid, String reason,
+ PrintWriter out) {
+ if (goodsId == null) {
+ out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼犲晢鍝�"));
+ return;
+ }
+
+ RecommendGoodsDeleteHistory history = new RecommendGoodsDeleteHistory();
+ history.setDevice(acceptData.getDevice());
+ history.setReason(reason);
+ history.setUid(uid);
+ history.setGoodsSource(source == null ? Constant.SOURCE_TYPE_TAOBAO : source);
+ history.setGoodsId(goodsId);
+ recommendGoodsDeleteHistoryService.addRecommendGoodsDeleteHistory(history);
+ out.print(JsonUtil.loadTrueResult(""));
+ }
+
}
--
Gitblit v1.8.0