From 73a3d86a47d8da711b609cd224c63526f7d00f9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 七月 2020 12:49:06 +0800
Subject: [PATCH] 比价相关的bug修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 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 958dcd8..f5026cb 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
@@ -5,6 +5,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -17,32 +18,30 @@
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TBPid;
import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.common.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.tlj.TaoLiJinCreateException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.log.TaoKeLogHelper;
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.TLJBuyGoodsService;
-import com.yeshi.fanli.service.inter.taobao.TLJFreeBuyGoodsService;
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.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -80,21 +79,15 @@
@Resource
private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
- @Resource
- private UserInfoExtraService userInfoExtraService;
-
- @Resource
- private UserTaoLiJinRecordService userTaoLiJinRecordService;
@Resource
private TLJBuyGoodsService tljBuyGoodsService;
@Resource
private IntegralGetService integralGetService;
-
+
@Resource
- private TLJFreeBuyGoodsService tljFreeBuyGoodsService;
-
+ private TaoBaoLinkManager taoBaoLinkManager;
private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
JSONObject data = new JSONObject();
@@ -132,7 +125,6 @@
integralGetService.addTaoLiJinBuy(uid, auctionId);
}
-
/**
* 鑾峰彇娣樺疂鐨勫垎浜摼鎺�
@@ -189,7 +181,7 @@
doTaoLiJinBuy(acceptData, uid, auctionId, out);
return;
}
-
+
ClientTBPid clientTBPid = null;
String dpid = null;
@@ -246,11 +238,13 @@
if (specialConvert) {
if (!StringUtil.isNullOrEmpty(specialId)) {
if (source != null && "taolijin_free_buy".equals(source)) {
- taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId, null);
+ taoBaoLink = taoBaoLinkManager.getTaoLiJinLinkForBuy(uid, auctionId, null);
}
if (taoBaoLink == null) {
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid, auctionId,specialId,null);
+ if(taoBaoLink!=null)
+ clientTBPid=null;
}
data.put("native", true);
@@ -262,9 +256,8 @@
else
taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
tbPidService.getIOSDefault().getPid());
-
} else
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid, auctionId, specialId,null);
LogHelper.test("璐拱杞摼:榛樿PID杞摼-" + uid + "锛�" + auctionId);
}
} else {// 涓嶆槸杩斿埄搴撶殑鍟嗗搧锛岀敤鐗规畩PID鏇夸唬
@@ -275,10 +268,10 @@
}
if (!StringUtil.isNullOrEmpty(relationId)) {//
if (source != null && "taolijin_free_buy".equals(source)) {
- taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuy(uid, specialId, auctionId,
- TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
+ taoBaoLink = taoBaoLinkManager.getTaoLiJinLinkForBuy(uid, auctionId,
+ TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
} else {
- taoBaoLink = shareGoodsService.getTaoBaoLinkForShare(uid, auctionId, relationId,
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(uid, auctionId, relationId,
TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
}
@@ -303,12 +296,15 @@
data.put("tbPidInfo", clientTBPid);
out.print(JsonUtil.loadTrueResult(data));
+ TaoKeLogHelper.convertLinkInfo(
+ String.format("uid:%s auctionId:%s 杈撳嚭缁撴灉:", uid, auctionId + "") + data.toString());
+
// 鑾峰緱閲戝竵
integralGetService.addCouponRebate(uid);
} catch (ShareGoodsException e) {
- if (e.getCode() == 1001) {
- out.print(JsonUtil.loadFalseResult(1001, e.getMsg()));
+ if (e.getCode() == 1001 || e.getCode() == 1002) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
} else {
out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
}
@@ -366,7 +362,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇锋眰澶辫触"));
}
- businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
+ businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""),acceptData.getSystem());
}
}
--
Gitblit v1.8.0