From afb85211ae10481f73a4809964ebb7b11e923ff0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 四月 2020 18:37:18 +0800
Subject: [PATCH] 站内信修改
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/DaTaoKeUtil.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 30cead9..6ed5ba7 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
@@ -593,6 +593,21 @@
} 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 goods;
--
Gitblit v1.8.0