From c007868c62c7da5c9ce1bf0e77d9e5f8619826e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 12 六月 2019 12:24:09 +0800
Subject: [PATCH] 查询默认有效调整

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..68f209c 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
@@ -7,8 +7,8 @@
 
 import org.springframework.stereotype.Component;
 
+import com.yeshi.fanli.dto.HongBao;
 import com.yeshi.fanli.dto.HongBaoDTO;
-import com.yeshi.fanli.entity.bus.user.HongBao;
 import com.yeshi.fanli.entity.bus.user.Order;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
@@ -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