From ca3e865a9e3c22fc24c7ca4b67ad8c25d3f2ef18 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 十一月 2019 11:01:31 +0800
Subject: [PATCH] 口令过期消息队列
---
fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
index 9e17cc5..2c0c7c7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -29,6 +29,7 @@
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.jd.JDOrderItem;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -152,9 +153,10 @@
*/
public static String convertShortLink(String materialId, String couponUrl, String positionId, String ext1) {
String url = convertLink(materialId, couponUrl, positionId, ext1);
- if (!StringUtil.isNullOrEmpty(url)) {
- url = HttpUtil.getShortLink(url);
- }
+//鏆傛椂娉ㄩ噴
+// if (!StringUtil.isNullOrEmpty(url)) {
+// url = HttpUtil.getShortLink(url);
+// }
return url;
}
@@ -399,8 +401,8 @@
if (discount_temp == null) {
add = true;
discount_temp = discount;
- } else if (discount_temp.compareTo(discount) > 0) { // 鍒搁潰棰濆ぇ
- add = true;
+ } else if (discount_temp.compareTo(discount) < 0 && discount.compareTo(price) <= 0) {
+ add = true; // 鍒搁潰棰濆ぇ,涓斿埜鑳藉浣跨敤
}
if (add) {
@@ -485,14 +487,17 @@
if (!StringUtil.isNullOrEmpty(isFreeShipping)) {
goods.setIsFreeShipping(Integer.parseInt(isFreeShipping));
}
-
+ String inOrderCount = json.optString("inOrderCount");
+ if (!StringUtil.isNullOrEmpty(isFreeShipping)) {
+ goods.setInOrderCount30Days(Long.parseLong(inOrderCount));
+ }
+
goods.setCouponInfo(null);
goods.setGoodCommentsShare(null);
List<String> imageList = new ArrayList<>();
imageList.add(json.optString("imgUrl"));
goods.setPicUrl(json.optString("imgUrl"));
goods.setImageList(imageList);
- goods.setInOrderCount30Days(0L);
goods.setIsHot(null);
goods.setMaterialUrl(json.optString("materialUrl"));
goods.setOwner(null);
@@ -523,6 +528,7 @@
jsonDTO.put("goodsReq", json);
String result = baseRequest2("jd.union.open.goods.jingfen.query", null, jsonDTO);
+ LogHelper.test(result);
System.out.println(result);
JSONObject resultJson = JSONObject.fromObject(result);
resultJson = resultJson.optJSONObject("jd_union_open_goods_jingfen_query_response");
--
Gitblit v1.8.0