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/tlj/UserTaoLiJinNewbiesServiceImpl.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java index f1b772f..69a7845 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinNewbiesServiceImpl.java @@ -217,6 +217,7 @@ detail.setTitle(TaoLiJinDetailTypeEnum.add.getDesc()); detail.setType(TaoLiJinDetailTypeEnum.add); detail.setCreateTime(new Date()); + detail.setRemark("鏂颁汉绾㈠寘"); userTaoLiJinDetailService.insertSelective(detail); @@ -252,11 +253,11 @@ // 楠岃瘉鏄惁鏈夊埜 if (goods == null || goods.getCouponAmount() == null || - goods.getCouponAmount().compareTo(new BigDecimal(0)) == 0) { + goods.getCouponAmount().compareTo(new BigDecimal(0)) <= 0) { executor.execute(new Runnable() { @Override public void run() { - tljFreeBuyGoodsService.deleteByGoodsId(goods.getId()); + tljFreeBuyGoodsService.deleteByGoodsId(goods.getAuctionId()); } }); throw new UserTaoLiJinNewbiesException(1, "璇ュ晢鍝侀潪鍏嶅崟鍟嗗搧"); @@ -264,11 +265,11 @@ // 楠岃瘉鍒稿悗浠� 鏄惁鍦� 1-2鍏� BigDecimal money = TaoBaoUtil.getAfterUseCouplePrice(goods); - if (money.compareTo(new BigDecimal(1.0)) < 0 && money.compareTo(new BigDecimal(2.0)) > 0) { + if (money.compareTo(new BigDecimal(1.0)) < 0 || money.compareTo(new BigDecimal(2.0)) > 0) { executor.execute(new Runnable() { @Override public void run() { - tljFreeBuyGoodsService.deleteByGoodsId(goods.getId()); + tljFreeBuyGoodsService.deleteByGoodsId(goods.getAuctionId()); } }); throw new UserTaoLiJinNewbiesException(1, "璇ュ晢鍝侀潪鍏嶅崟鍟嗗搧"); @@ -309,6 +310,7 @@ detail.setTitle(TaoLiJinDetailTypeEnum.reduce.getDesc()); detail.setType(TaoLiJinDetailTypeEnum.reduce); detail.setCreateTime(new Date()); + detail.setRemark("鏂颁汉鍏嶅崟浣跨敤绾㈠寘"); userTaoLiJinDetailService.insertSelective(detail); // 鍒涘缓娣樼ぜ閲戦摼鎺� -- Gitblit v1.8.0