From 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 九月 2019 16:58:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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 a6bfe0a..e492da6 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,14 @@
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.VersionUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -86,19 +86,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) {
@@ -107,6 +109,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;
@@ -118,11 +123,8 @@
data.put("type", 1);
data.put("link", link);
out.print(JsonUtil.loadTrueResult(data));
-
- // 1.6.5 鑷喘绔嬪噺娣诲姞 閲戝竵
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
- integralGetService.addTaoLiJinBuy(uid, auctionId);
-
+
+ integralGetService.addTaoLiJinBuy(uid, auctionId);
}
/**
@@ -288,9 +290,8 @@
out.print(JsonUtil.loadTrueResult(data));
// 鑾峰緱閲戝竵
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
- integralGetService.addCouponRebate(uid);
-
+ integralGetService.addCouponRebate(uid);
+
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
@@ -422,10 +423,9 @@
history.setGoodsId(goodsId);
recommendGoodsDeleteHistoryService.addRecommendGoodsDeleteHistory(history);
out.print(JsonUtil.loadTrueResult(""));
-
+
// 鑾峰緱閲戝竵
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
- integralGetService.addCloseRecommendGoods(uid);
+ integralGetService.addCloseRecommendGoods(uid);
}
}
--
Gitblit v1.8.0