From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 30 七月 2019 09:07:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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