From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
index 2434fd1..b717f84 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java
@@ -92,7 +92,7 @@
 		hongBao.setId(hongBaoDTO.getId());
 		hongBao.setOrderId(hongBaoDTO.getOrderId());
 
-		if (hongBaoDTO.getSettlement() != null)
+		if (hongBaoDTO.getSettlement() != null&&hongBaoDTO.getSettlement().compareTo(new BigDecimal(0))>0)
 			hongBao.setPayMoney(hongBaoDTO.getSettlement());
 		else
 			hongBao.setPayMoney(hongBaoDTO.getPayMoney());

--
Gitblit v1.8.0