From 9b55262bb45c81c997ab04e55e8de13e14b8ca7d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 15:11:37 +0800
Subject: [PATCH] 商品最高返
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 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 6218b4d..3ec1657 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
@@ -21,12 +21,12 @@
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
-import com.yeshi.fanli.exception.ShareGoodsException;
+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.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
-import com.yeshi.fanli.service.inter.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
@@ -34,14 +34,16 @@
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.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 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;
@@ -85,19 +87,21 @@
@Resource
private TLJBuyGoodsService tljBuyGoodsService;
-
+
@Resource
private IntegralGetService integralGetService;
-
-
private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
JSONObject data = new JSONObject();
- TaoBaoLink taoBaoLink;
+ TaoBaoLink taoBaoLink = null;
try {
// 鏍规嵁鏃ユ湡涓庡晢鍝両D鏌ヨ
TLJBuyGoods tljBuyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(auctionId,
TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+ if (tljBuyGoods == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧涓嶅瓨鍦�"));
+ return;
+ }
String appKey = tljBuyGoods.getAppKey();
TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppKeyCache(appKey);
if (config == null) {
@@ -106,6 +110,9 @@
}
TaoKeAppInfo app = new TaoKeAppInfo(config.getAppKey(), config.getAppSecret(), config.getDefaultPid());
taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuyWithOutFanLi(uid, auctionId, app);
+ } catch (TaoLiJinCreateException e1) {
+ out.print(JsonUtil.loadFalseResult(e1.getCode(), "娣樼ぜ閲戠孩鍖呭垱寤哄け璐�"));
+ return;
} catch (ShareGoodsException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
return;
@@ -117,7 +124,7 @@
data.put("type", 1);
data.put("link", link);
out.print(JsonUtil.loadTrueResult(data));
-
+
integralGetService.addTaoLiJinBuy(uid, auctionId);
}
@@ -149,6 +156,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 {
@@ -169,13 +184,26 @@
return;
}
+ ClientTBPid clientTBPid = null;
+
+ String dpid = null;
+ if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
+ dpid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
+ } else {
+ dpid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
+ }
+ String psiteId = dpid.split("_")[2];
+ String padzoneId = dpid.split("_")[3];
+ TaoBaoUnionConfig config1 = taoBaoUnionConfigService.getConfigByAppIdCache(psiteId);
+ clientTBPid = new ClientTBPid(config1.getAppKey(), dpid, psiteId, padzoneId);
+
JSONObject data = new JSONObject();
boolean isNative = false;
String pid = null;
boolean specialConvert = false;
- if (goods.getMaterialLibType() != null && goods.getMaterialLibType() == 1) {
+ if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
specialConvert = true;
} else
specialConvert = false;
@@ -281,11 +309,13 @@
link.put("couponUrl", taoBaoLink.getCouponLink());
data.put("type", 1);
data.put("link", link);
+ if (clientTBPid != null)
+ data.put("tbPidInfo", clientTBPid);
out.print(JsonUtil.loadTrueResult(data));
// 鑾峰緱閲戝竵
integralGetService.addCouponRebate(uid);
-
+
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -329,9 +359,9 @@
String siteId = tbPid.getPid().split("_")[2];
String adzoneId = tbPid.getPid().split("_")[3];
TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- ClientTBPid clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ ClientTBPid clientTBPid1 = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
data.put("type", 2);
- data.put("tbPidInfo", clientTBPid);
+ data.put("tbPidInfo", clientTBPid1);
data.put("native", true);
}
@@ -417,7 +447,7 @@
history.setGoodsId(goodsId);
recommendGoodsDeleteHistoryService.addRecommendGoodsDeleteHistory(history);
out.print(JsonUtil.loadTrueResult(""));
-
+
// 鑾峰緱閲戝竵
integralGetService.addCloseRecommendGoods(uid);
}
--
Gitblit v1.8.0