From 73a3d86a47d8da711b609cd224c63526f7d00f9b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 七月 2020 12:49:06 +0800
Subject: [PATCH] 比价相关的bug修复
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 87 +++++++++++++++++++++----------------------
1 files changed, 43 insertions(+), 44 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 56900eb..2814afe 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
@@ -1,28 +1,12 @@
package com.yeshi.fanli.util.taobao;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
-
-import com.yeshi.goods.facade.dto.taobao.TaoBaoShopInfoDTO;
+import com.yeshi.common.entity.PageEntity;
+import com.yeshi.common.entity.taobao.TaoBaoShopInfo;
+import com.yeshi.common.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.dto.taobao.TaoLiJinDTO;
import com.yeshi.fanli.dto.taobao.api.TaoKeOfficialActivityConvertResultDTO;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinReport;
-import com.yeshi.fanli.entity.taobao.SearchFilter;
-import com.yeshi.fanli.entity.taobao.SearchShopFilter;
-import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.goods.facade.entity.taobao.TaoBaoHead;
-import com.yeshi.fanli.entity.taobao.TaoBaoProvince;
-import com.yeshi.fanli.entity.taobao.TaoBaoSearchNav;
-import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.common.entity.taobao.TaoBaoShopInfo;
-import com.yeshi.common.entity.taobao.TaoKeAppInfo;
+import com.yeshi.fanli.entity.taobao.*;
import com.yeshi.fanli.exception.taobao.TaoBaoAuthException;
import com.yeshi.fanli.exception.taobao.TaoBaoTokenParseException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
@@ -31,14 +15,20 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.log.TLJLogHelper;
import com.yeshi.fanli.log.TaoKeLogHelper;
-import com.yeshi.common.entity.PageEntity;
-import org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
-import org.yeshi.utils.TimeUtil;
-
+import com.yeshi.goods.facade.dto.taobao.TaoBaoShopInfoDTO;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoHead;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
+import org.yeshi.utils.TimeUtil;
+import org.yeshi.utils.taobao.TbImgUtil;
+
+import java.math.BigDecimal;
+import java.util.*;
//娣樺疂瀹PI鎺ュ彛
public class TaoKeApiUtil {
@@ -359,7 +349,7 @@
* @return
* @throws TaobaoGoodsDownException
*/
- public static TaoBaoGoodsBrief searchGoodsDetail(Long id) throws TaobaoGoodsDownException {
+ public static TaoBaoGoodsBrief searchGoodsDetail(Long id, String specialId,String relationId) throws TaobaoGoodsDownException {
TaoBaoGoodsBrief goods = getSimpleGoodsInfo(id);
if (goods == null)
return null;
@@ -368,7 +358,7 @@
filter.setPage(1);
filter.setPageSize(50);
TaoBaoSearchResult result = searchWuLiaoForDetail(goods.getTitle(), goods.getZkPrice(), goods.getProvcity(),
- goods.getUserType(), null, null);
+ goods.getUserType(), specialId, relationId);
if (result != null && result.getTaoBaoGoodsBriefs() != null)
for (TaoBaoGoodsBrief g : result.getTaoBaoGoodsBriefs()) {
System.out.println(goods.getAuctionId() + ":" + g.getAuctionId());
@@ -384,7 +374,7 @@
// 浠庤浆閾炬悳绱�
TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(),
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
- TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT),null,null);
+ TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT), specialId, relationId);
if (newGoods != null) {
goods.setTkRate(newGoods.getTkRate());
@@ -412,6 +402,10 @@
return goods;
}
+ }
+
+ public static TaoBaoGoodsBrief searchGoodsDetail(Long id) throws TaobaoGoodsDownException {
+ return searchGoodsDetail(id, null,null);
}
/**
@@ -461,7 +455,7 @@
// 浠庤浆閾炬悳绱�
TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(),
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
- TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT),null,null);
+ TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT), null, null);
if (newGoods != null) {
goods.setTkRate(newGoods.getTkRate());
@@ -1074,7 +1068,7 @@
* @return
*/
public static QuanInfo getQuanInfo(Long auctionId, String activityId) {
- QuanInfo info = new QuanInfo();
+ QuanInfo info = new TaoKeApiUtil.QuanInfo();
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.coupon.get");
map.put("item_id", auctionId + "");
@@ -1714,19 +1708,22 @@
}
}
- public static TaoBaoGoodsBrief specialConvertCoupon(Long auctionId, TaoKeAppInfo app,String specialId, String relationId) {
+ public static TaoBaoGoodsBrief specialConvertCoupon(Long auctionId, TaoKeAppInfo app, String specialId, String relationId) {
String pid = app.getPid();
String[] sts = pid.split("_");
Map<String, String> map = new HashMap<>();
map.put("method", "taobao.tbk.coupon.convert");
map.put("item_id", auctionId + "");
map.put("adzone_id", sts[3]);
- if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {
- map.put("special_id", specialId);
- } else if (!StringUtil.isNullOrEmpty(specialId)) {
- map.put("special_id", specialId);
- } else if (!StringUtil.isNullOrEmpty(relationId)) {
- map.put("relation_id", specialId);
+
+ if (System.currentTimeMillis() > TimeUtil.convertToTimeTemp("2020-07-22", "yyyy-MM-dd")) {
+ if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {
+ map.put("special_id", specialId);
+ } else if (!StringUtil.isNullOrEmpty(specialId)) {
+ map.put("special_id", specialId);
+ } else if (!StringUtil.isNullOrEmpty(relationId)) {
+ map.put("relation_id", relationId);
+ }
}
try {
@@ -2293,13 +2290,15 @@
return null;
}
+ public static class QuanInfo {
+ public String coupon_start_time;// 寮�濮嬫椂闂�
+ public String coupon_end_time; // 鍒哥粨鏉熸椂闂�
+ public BigDecimal coupon_amount;// 鍒搁噾棰�
+ public int coupon_total_count;// 鍒告�绘暟閲�
+ public int coupon_remain_count;// 鍒稿墿浣欐暟閲�
+ public BigDecimal coupon_start_fee;// 鍒歌捣濮嬮噾棰�
+ }
+
}
-class QuanInfo {
- public String coupon_start_time;// 寮�濮嬫椂闂�
- public String coupon_end_time; // 鍒哥粨鏉熸椂闂�
- public BigDecimal coupon_amount;// 鍒搁噾棰�
- public int coupon_total_count;// 鍒告�绘暟閲�
- public int coupon_remain_count;// 鍒稿墿浣欐暟閲�
- public BigDecimal coupon_start_fee;// 鍒歌捣濮嬮噾棰�
-}
+
--
Gitblit v1.8.0