From 5a80c35e42ba1ed7340097ea9b156016e52a23f2 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 26 八月 2019 17:05:05 +0800 Subject: [PATCH] 京东订单修改 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 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 236a4be..530f6f4 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 @@ -16,16 +16,20 @@ import com.yeshi.fanli.entity.taobao.ClientTBPid; 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.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.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.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.TaoBaoBuyRelationMapService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService; @@ -36,6 +40,7 @@ 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.TaoKeApiUtil; @@ -78,11 +83,27 @@ @Resource private UserTaoLiJinRecordService userTaoLiJinRecordService; + @Resource + private TLJBuyGoodsService tljBuyGoodsService; + private void doTaoLiJinBuy(Long uid, Long auctionId, PrintWriter out) { JSONObject data = new JSONObject(); - TaoBaoLink taoBaoLink; + TaoBaoLink taoBaoLink = null; try { - taoBaoLink = shareGoodsService.getTaoLiJinLinkForBuyWithOutFanLi(uid, auctionId); + // 鏍规嵁鏃ユ湡涓庡晢鍝両D鏌ヨ + TLJBuyGoods tljBuyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(auctionId, + TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd")); + String appKey = tljBuyGoods.getAppKey(); + TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppKeyCache(appKey); + if (config == null) { + out.print(JsonUtil.loadFalseResult(2, "鐢熸垚鎺ㄥ箍閾炬帴澶辫触")); + return; + } + 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; @@ -297,7 +318,6 @@ data.put("type", 1); data.put("link", link); data.put("native", true); - } catch (Exception e1) { String siteId = tbPid.getPid().split("_")[2]; String adzoneId = tbPid.getPid().split("_")[3]; -- Gitblit v1.8.0