From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 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 500ad52..b307903 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;
@@ -25,6 +26,7 @@
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;
@@ -32,9 +34,7 @@
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
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;
@@ -42,8 +42,8 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import net.sf.json.JSONObject;
@@ -79,17 +79,15 @@
@Resource
private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
- @Resource
- private UserInfoExtraService userInfoExtraService;
-
- @Resource
- private UserTaoLiJinRecordService userTaoLiJinRecordService;
@Resource
private TLJBuyGoodsService tljBuyGoodsService;
@Resource
private IntegralGetService integralGetService;
+
+ @Resource
+ private TaoBaoLinkManager taoBaoLinkManager;
private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
JSONObject data = new JSONObject();
@@ -156,6 +154,14 @@
return;
}
+ try {
+ // 鏃ュ織璁板綍
+ String info = String.format("type=buy&uid=%s&goodsId=%s&source=%s&goodsType=%s", uid, auctionId, source,
+ Constant.SOURCE_TYPE_TAOBAO);
+ LogHelper.orderInfo(info);
+ } catch (Exception e) {
+ }
+
TaoBaoGoodsBrief goods = null;
try {
@@ -179,7 +185,7 @@
ClientTBPid clientTBPid = null;
String dpid = null;
- if (goods.getMaterialLibType() != null && goods.getMaterialLibType() > 0) {
+ if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
dpid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
} else {
dpid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
@@ -195,7 +201,7 @@
boolean specialConvert = false;
- if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
+ if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
specialConvert = true;
} else
specialConvert = false;
@@ -231,20 +237,14 @@
// 鏄繑鍒╁晢鍝佸簱鐨勫晢鍝�
if (specialConvert) {
if (!StringUtil.isNullOrEmpty(specialId)) {
- 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, null);
- }
- }
+ if (source != null && "taolijin_free_buy".equals(source)) {
+ taoBaoLink = taoBaoLinkManager.getTaoLiJinLinkForBuy(uid, auctionId, null);
}
if (taoBaoLink == null) {
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuyWithSpecial(uid, specialId, auctionId);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid, auctionId,null);
+ if(taoBaoLink!=null)
+ clientTBPid=null;
}
data.put("native", true);
@@ -256,9 +256,8 @@
else
taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
tbPidService.getIOSDefault().getPid());
-
} else
- taoBaoLink = shareGoodsService.getTaoBaoLinkForBuy(uid, auctionId, pidType);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid, auctionId, null);
LogHelper.test("璐拱杞摼:榛樿PID杞摼-" + uid + "锛�" + auctionId);
}
} else {// 涓嶆槸杩斿埄搴撶殑鍟嗗搧锛岀敤鐗规畩PID鏇夸唬
@@ -268,19 +267,11 @@
LogHelper.errorDetailInfo(e, "uid:" + uid, null);
}
if (!StringUtil.isNullOrEmpty(relationId)) {//
- 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,
- TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
- }
- }
+ if (source != null && "taolijin_free_buy".equals(source)) {
+ 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);
}
@@ -305,9 +296,18 @@
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 || e.getCode() == 1002) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ } else {
+ out.print(JsonUtil.loadFalseResult(1, e.getMsg()));
+ }
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -362,7 +362,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇锋眰澶辫触"));
}
- businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));
+ businessEmergent110Service.buyTaoBaoGoodsError(StringUtil.Md5(auctionId + ""),acceptData.getSystem());
}
}
--
Gitblit v1.8.0