From a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 25 七月 2019 12:20:01 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java index 25b0d4c..f966d23 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java @@ -1690,7 +1690,8 @@ MoneyBigDecimalUtil.getWithNoZera(detail.getQuanPrice()))); taoBaoGoods.setCouponLeftCount(detail.getQuanSurplus()); taoBaoGoods.setCouponStartFee(new BigDecimal(detail.getQuanCondition())); - taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus()); + if (detail.getQuanReceive() != null) + taoBaoGoods.setCouponTotalCount(detail.getQuanSurplus() + detail.getQuanReceive()); taoBaoGoods.setPictUrl(detail.getPic()); taoBaoGoods.setPictUrlWhite(detail.getPic()); taoBaoGoods.setSellerId(detail.getSellerId()); -- Gitblit v1.8.0