From da4c766d07a83e62992a0e287b678e13aeb6afda Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 04 十二月 2019 10:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsUpdateServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsUpdateServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsUpdateServiceImpl.java
index bcaad5e..efa6ea9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsUpdateServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TLJFreeBuyGoodsUpdateServiceImpl.java
@@ -35,9 +35,18 @@
List<TLJFreeBuyGoods> list = tljFreeBuyGoodsDao.listByGoodsId(goods.getAuctionId());
if (list != null) {
+
+ // 楠岃瘉鏄惁鏈夊埜
+ if (goods.getCouponAmount() == null || goods.getCouponAmount().compareTo(new BigDecimal(0)) <= 0) {
+ for (TLJFreeBuyGoods tljGoods : list) {
+ tljFreeBuyGoodsDao.delete(tljGoods.getId());
+ }
+ return;
+ }
+
// 璁＄畻鍒稿悗浠� 1<= n <= 2
BigDecimal couplePrice = TaoBaoUtil.getAfterUseCouplePrice(goods);
- if (couplePrice.compareTo(new BigDecimal(1.0)) < 0 && couplePrice.compareTo(new BigDecimal(2.0)) > 0) {
+ if (couplePrice.compareTo(new BigDecimal(1.0)) < 0 || couplePrice.compareTo(new BigDecimal(2.0)) > 0) {
for (TLJFreeBuyGoods tljGoods : list) {
tljFreeBuyGoodsDao.delete(tljGoods.getId());
}
--
Gitblit v1.8.0