From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 141 ++++++++++++++++++++++++++++++++--------------
1 files changed, 98 insertions(+), 43 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
index 7075b9d..6f14c5b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.dto.dataoke.DingDongQiangDTO;
import com.yeshi.fanli.dto.dataoke.DingDongTime;
+import com.yeshi.fanli.dto.taobao.DaTaoKeFilterResult;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -30,6 +31,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -131,41 +133,10 @@
"馃暒",// 鍗佷竴鐐瑰崐
};
- static final String[] evaluateEmojis = new String[] {
- "馃挓",
- "馃尭",
- "馃嵏",
- "馃嵑",
- "馃摙",
- "鉂�",
- "馃挐",
- "馃拫",
- "馃憶",
- "馃惥",
- "馃尮",
- "馃敟",
- "馃帀",
- "馃巵",
- "馃崶",
- "馃嵀",
- "馃尯",
- "馃憫",
- "鉁�",
- "馃挮",
- "馃嵒",
- "馃巿",
- "馃挜",
- "馃挄",
- "馃挒",
- "馃挵",
- "馃拰",
- "馃挱",
- "馃尲",
- "馃崁"
- };
-
-
-
+ static final String[] evaluateEmojis = new String[] { "馃挓", "馃尭", "馃嵏", "馃嵑", "馃摙", "鉂�", "馃挐", "馃拫", "馃憶", "馃惥",
+ "馃尮", "馃敟", "馃帀", "馃巵", "馃崶", "馃嵀", "馃尯", "馃憫", "鉁�", "馃挮", "馃嵒", "馃巿", "馃挜", "馃挄", "馃挒", "馃挵", "馃拰", "馃挱",
+ "馃尲", "馃崁" };
+
public static List<GoodsClass> goodsClasses;
static {
goodsClasses = new ArrayList<>();
@@ -555,11 +526,10 @@
return commonEmojis[(int) (Math.random() * commonEmojis.length)];
}
-
public static String getEvaluateEmojis() {
return evaluateEmojis[(int) (Math.random() * evaluateEmojis.length)];
}
-
+
public static String getDesc(DaTaoKeDetailV2 detail) {
// 鏍囬+鍒稿悗浠�+鍖呴偖+鎻忚堪
@@ -586,14 +556,99 @@
return desc;
}
- public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 detail) {
- if (detail != null && goods != null) {
+ public static DaTaoKeFilterResult filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 v2,
+ boolean filterCouponInfo) {
+ if (v2 != null && goods != null) {
// 閲嶆柊璁剧疆鏍囬涓庡埜浠锋牸
- goods.setTitle(detail.getDtitle());
- if (!StringUtil.isNullOrEmpty(detail.getMainPic()))
- goods.setPictUrlWhite(detail.getMainPic());
+ goods.setTitle(v2.getDtitle());
+ if (!StringUtil.isNullOrEmpty(v2.getMainPic()))
+ goods.setPictUrlWhite(v2.getMainPic());
+ // 璁剧疆绠�浠�
+
+ goods.setDescription(v2.getDesc());
+ // 濡傛灉娌℃湁鍒镐俊鎭�,鍒欐彁渚涘埜淇℃伅
+ if (canFilterCouponInfo(goods, v2)) {
+ try {
+ long time = System.currentTimeMillis();
+ // 鍒稿湪鏈夋晥鏈熷唴骞朵笖杩樻湁鍓╀綑鍒�
+ if (time >= TimeUtil.convertToTimeTemp(v2.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss")
+ && time <= TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss")
+ && (v2.getCouponTotalNum() - v2.getCouponReceiveNum()) > 0) {
+ goods.setCouponStartFee(v2.getOriginalPrice());
+
+ goods.setCouponEffectiveEndTime(TimeUtil.getGernalTime(
+ TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss"),
+ "yyyy-MM-dd"));
+ goods.setCouponEffectiveStartTime(TimeUtil.getGernalTime(
+ TimeUtil.convertToTimeTemp(v2.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss"),
+ "yyyy-MM-dd"));
+
+ goods.setCouponAmount(v2.getCouponPrice());
+ goods.setCouponInfo(
+ String.format("婊�%s鍏冨噺%s鍏�", v2.getOriginalPrice() + "", v2.getCouponPrice() + ""));
+ goods.setCouponLeftCount(v2.getCouponTotalNum() - v2.getCouponReceiveNum());
+ goods.setCouponLink(v2.getCouponLink());
+ goods.setCouponTotalCount(v2.getCouponTotalNum());
+ goods.setShopCoupon(false);
+ goods.setZkPrice(v2.getOriginalPrice());
+ return new DaTaoKeFilterResult(goods, DaTaoKeFilterResult.FILTER_TYPE_PRICE_AND_COUPON);
+ }
+
+ } catch (Exception e) {
+
+ }
+ } else {// 閮芥湁鍒�
+ long time = System.currentTimeMillis();
+ // 鍒稿湪鏈夋晥鏈熷唴骞朵笖杩樻湁鍓╀綑鍒�
+ if (time >= TimeUtil.convertToTimeTemp(v2.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss")
+ && time <= TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss")
+ && (v2.getCouponTotalNum() - v2.getCouponReceiveNum()) > 0) {
+ // 濡傛灉涓や釜鍒哥殑闈㈤涓�鏍凤紝娣樺疂鍘熶环姣斿ぇ娣樺鍘熶环楂橈紝灏变互澶ф窐瀹㈠師浠蜂负鍑�
+ if (goods.getCouponAmount() != null && v2.getCouponPrice() != null
+ && goods.getCouponAmount().compareTo(v2.getCouponPrice()) == 0) {
+
+ if (goods.getZkPrice().compareTo(v2.getOriginalPrice()) > 0) {
+ goods.setZkPrice(v2.getOriginalPrice());
+ return new DaTaoKeFilterResult(goods, DaTaoKeFilterResult.FILTER_TYPE_PRICE);
+ }
+ }
+ }
+ }
}
- return goods;
+ return new DaTaoKeFilterResult(goods, DaTaoKeFilterResult.FILTER_TYPE_NONE);
+ }
+
+ /**
+ * 鏄惁鍙互杩囨护鎺夊埜淇℃伅
+ * @Title: filterCouponInfo
+ * @Description:
+ * @param goods
+ * @param v2
+ * void 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static boolean canFilterCouponInfo(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 v2) {
+ if (StringUtil.isNullOrEmpty(goods.getCouponInfo()) && v2 != null
+ && !StringUtil.isNullOrEmpty(v2.getCouponLink())) {
+ try {
+ long time = System.currentTimeMillis();
+ // 鍒稿湪鏈夋晥鏈熷唴骞朵笖杩樻湁鍓╀綑鍒�
+ if (time >= TimeUtil.convertToTimeTemp(v2.getCouponStartTime(), "yyyy-MM-dd HH:mm:ss")
+ && time <= TimeUtil.convertToTimeTemp(v2.getCouponEndTime(), "yyyy-MM-dd HH:mm:ss")
+ && (v2.getCouponTotalNum() - v2.getCouponReceiveNum()) > 0) {
+ return true;
+ }
+
+ } catch (Exception e) {
+
+ }
+ }
+
+ return false;
+ }
+
+ public static TaoBaoGoodsBrief filterTaoBaoGoods(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 v2) {
+ return filterTaoBaoGoods(goods, v2, false).getGoods();
}
public static DaTaoKeDetailV2 filterDaTaoKe(TaoBaoGoodsBrief goods, DaTaoKeDetailV2 detail) {
--
Gitblit v1.8.0