From d4b3ee96ac6093683fce254541b113fb6a762060 Mon Sep 17 00:00:00 2001
From: hexiaohui <hexiaohui@LAPTOP-03V48RSB>
Date: 星期三, 03 四月 2019 23:07:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 a017364..910ff7e 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
@@ -1309,11 +1309,11 @@
* 鐢ㄦ埛鍐嶆鍒嗘垚姣斾緥锛�0-100锛�
* @return
*/
- public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
- if (goodsBrief.getMaterialLibType() == null || goodsBrief.getMaterialLibType() == 1) {
- return "楼0";
- } else
- return "楼" + getGoodsHongBaoMoney(goodsBrief, rate).toString();
+ public static String getGoodsHongBaoInfo(TaoBaoGoodsBrief goodsBrief, BigDecimal rate) {
+ if (goodsBrief != null && goodsBrief.getMaterialLibType() != null && goodsBrief.getMaterialLibType() == 0)
+ return "楼0.00";
+ else
+ return "楼"+getGoodsHongBaoMoney(goodsBrief, rate).toString();
}
/**
--
Gitblit v1.8.0