From b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2019 17:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index b97e0aa..01f5d1a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -1392,7 +1392,7 @@
map.put("page_no", page + "");
map.put("page_size", pageSize + "");
map.put("material_id", materialId + "");
- map.put("content_id", "561388751621");
+// map.put("content_id", "561388751621");
String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
System.out.println(resultStr);
@@ -1663,7 +1663,7 @@
.optString("relation_id");
} catch (TaoKeApiException e) {
e.printStackTrace();
- LogHelper.error("娓犻亾ID鐢宠鍑洪敊:" + resultJSON);
+ LogHelper.error("娓犻亾ID鐢宠鍑洪敊:" + e.getMsg());
}
return null;
@@ -1948,10 +1948,10 @@
// 娣樼ぜ閲戝垱寤�
public static TaoLiJinDTO createTaoLiJin(Long auctionId, String name, BigDecimal perface, int totalNum,
- Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime,String pid) {
+ Date sendStartTime, Date sendEndTime, Date useStartTime, Date useEndTime,TaoKeAppInfo app) throws TaoKeApiException{
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.dg.vegas.tlj.create");
- map.put("adzone_id", pid.split("_")[3]);
+ map.put("adzone_id", app.getPid().split("_")[3]);
map.put("item_id", auctionId + "");
map.put("total_num", totalNum + "");
map.put("name", name);
@@ -1971,16 +1971,13 @@
if(useStartTime != null)
map.put("use_start_time", TimeUtil.getGernalTime(useStartTime.getTime(), "yyyy-MM-dd"));
-
- TaoKeAppInfo app = new TaoKeAppInfo();
- app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
- app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
try {
String result = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
JSONObject json = JSONObject.fromObject(result);
System.out.println(json);
JSONObject root = json.optJSONObject("tbk_dg_vegas_tlj_create_response");
if (root != null && root.optJSONObject("result") != null) {
+
if (root.optJSONObject("result").optBoolean("success")) {
JSONObject modelJson = root.optJSONObject("result").optJSONObject("model");
TaoLiJinDTO dto = new TaoLiJinDTO();
@@ -1988,7 +1985,23 @@
dto.setSendUrl(modelJson.optString("send_url"));
return dto;
}
+
+ // 鎺ュ彛杩斿洖寮傚父
+ String msgCode = root.optJSONObject("result").optString("msg_code");
+ if (!StringUtil.isNullOrEmpty(msgCode)) {
+ switch(msgCode){
+ case "FAIL_BIZ_ITEM_FORBIDDEN":
+ throw new TaoKeApiException(TaoKeApiException.CODE_TLJ_FORBIDDEN, "璇ュ晢鍝佷笉鏀寔鍒涘缓娣樼ぜ閲戠孩鍖�");
+ case "FAIL_BIZ_ACCOUNT_UN_PAID":
+ case "2":
+ throw new TaoKeApiException(TaoKeApiException.CODE_TLJ_NO_MONEY, "瀹樻柟鐜╂硶閽卞寘浣欓涓嶈冻");
+ default:
+ return null;
+ }
+ }
}
+ } catch (TaoKeApiException e) {
+ throw e;
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
--
Gitblit v1.8.0